From e3414f39793472f03d62fd034e324ad08772dbd6 Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 5 Apr 2001 14:40:50 +0000 Subject: [PATCH] --- Graphics/ingamefx/+health_empty.bmp | Bin 978 -> 0 bytes Graphics/ingamefx/+health_empty_1.bmp | Bin 0 -> 298 bytes Graphics/ingamefx/+health_empty_2.bmp | Bin 0 -> 298 bytes Graphics/ingamefx/+health_empty_3.bmp | Bin 0 -> 298 bytes Graphics/ingamefx/+health_empty_4.bmp | Bin 0 -> 298 bytes Graphics/ingamefx/+health_empty_5.bmp | Bin 0 -> 298 bytes Graphics/ingamefx/+health_full.bmp | Bin 978 -> 0 bytes Graphics/ingamefx/+health_full_1.bmp | Bin 0 -> 298 bytes Graphics/ingamefx/+health_full_2.bmp | Bin 0 -> 298 bytes Graphics/ingamefx/+health_full_3.bmp | Bin 0 -> 298 bytes Graphics/ingamefx/+health_full_4.bmp | Bin 0 -> 298 bytes Graphics/ingamefx/+health_full_5.bmp | Bin 0 -> 298 bytes makefile.gfx | 4 +- source/player/player.cpp | 77 ++++++++++-------- source/player/psidle.cpp | 2 +- source/player/psrun.cpp | 2 +- .../spongebob project/spongebob project.dsp | 4 - 17 files changed, 50 insertions(+), 39 deletions(-) delete mode 100644 Graphics/ingamefx/+health_empty.bmp create mode 100644 Graphics/ingamefx/+health_empty_1.bmp create mode 100644 Graphics/ingamefx/+health_empty_2.bmp create mode 100644 Graphics/ingamefx/+health_empty_3.bmp create mode 100644 Graphics/ingamefx/+health_empty_4.bmp create mode 100644 Graphics/ingamefx/+health_empty_5.bmp delete mode 100644 Graphics/ingamefx/+health_full.bmp create mode 100644 Graphics/ingamefx/+health_full_1.bmp create mode 100644 Graphics/ingamefx/+health_full_2.bmp create mode 100644 Graphics/ingamefx/+health_full_3.bmp create mode 100644 Graphics/ingamefx/+health_full_4.bmp create mode 100644 Graphics/ingamefx/+health_full_5.bmp diff --git a/Graphics/ingamefx/+health_empty.bmp b/Graphics/ingamefx/+health_empty.bmp deleted file mode 100644 index 0c245afa3fa0527cd14228db9f5a5e2807a9b258..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 978 zcmXw%e@s(X6vuBX$+DR_+7gKq)A_*S>`aYVA}&oQZP^yBok-CYO^1yjI`aO(`YTH_ zH}%S2ZY(U>;u?RkKs9wTtF$ytK>iT6F`C(gB0iVwPt9x#eW8z+ulE%^FX#JmKlhyX z?m73=JCiF&(fmv|F1wMvRivcI53+sT$|WylMDd+FeBNwJADHxzbGn&^00zJ!=Y7505-q3)SVcn#AEYYdI+Ga7!0 zNk}QI#&_Q&s+Z#~S3Fi&?Rz`C$6lxYT~=f*pOx>?OfG*ezeaq(;yRNaQ)6P8MFi<6 zV}}a;ro1gsgmPoG%np4qJ`u6{0v;?fI_(zzV(c5q@{{pX!BKb=1Ufnc!=JD+vg&9< zePDN|%Z%9OGkl1#uQRHMS*6iBj{zTA-Bq0|_i9Gd*siUznX`e#>R)yCUF^SyM^$?# zxiWM87G1$SVrbiciqdUkx-#6YblCMd-$|{**Uy+S{o`sZ=p631vmC1I%?m8o`A6S6 z;4tTSC$ke}H34}$y%eA6GqKb5?=!S=1I=OJ06jlalCl)*V$xJo4Vmi%%EZqeRdLv0%A&lSB1K9-jnmpQo++#V>y?J&xO)3*43T>n4*|2MW>g5vof7483To_|GqirWA0^Z$Qgi1LW?|D+`R|Ns5UXtVI& zny3GNV^}tAmG2iN!TSIIf96lN`v1Sf_AmoeS#w{$~hXVqjoV-FyH4-v9qU?XUFzy#D{^&LcqYnCvWZ3k{vUTiZ=( d^4&YD|2@DLrXO_wS|DUAf+W*nDs27#{{alFhgz=L0>!`}#900R{{pOHnL9el;z5djf>nOg w`oEh&f1^a2J&^l%vvL0Ku=D>9?Z3$&f3b0?{Quwo=i2^H-!wmU{r~uH06k=mK>z>% literal 0 HcmV?d00001 diff --git a/Graphics/ingamefx/+health_empty_4.bmp b/Graphics/ingamefx/+health_empty_4.bmp new file mode 100644 index 0000000000000000000000000000000000000000..3c6a4145d2e3dbf783473070c03b621ef1b67f26 GIT binary patch literal 298 zcmZ?r)na4-gEAng0mYm^nvsD8EWQOu3UfoS0FVvB|ADY1JDXubXBWfbx$_t{tX<2n zcjr!qQ%8?7T)T9M!O_x^;oh}d3{M{3WBBmqEyMTk?-_o7|IYCLKM4N^nHwD;?k9L2 z$N_%oG5gVg^9Ffg$1J-y97xjyRu zAE4;X(EI0rV$8p7XK8!hcl~v8{{R1(x%GP-7#Ns7HSKb9s`ttDH~qg`w<>=%P>k_o z<2KVqK_TC)|NpJ+LsfEtdKZ2a3`!SLaW?%_|3`hfu!}d)-lW5gf#;P(Or0!*f0-Uq IOA9Xm0Ji0R!T;Auc|Np(Ud%Lr0NB~$Eix^jA&ir5dfd+xV>8d3lbxglcXZ{d} z2m#4mAhAiSe_Fn1yblw+1riHdeMSoAX1&NtySjA_- KwB8W8$^Zb5ErjO) literal 0 HcmV?d00001 diff --git a/Graphics/ingamefx/+health_full.bmp b/Graphics/ingamefx/+health_full.bmp deleted file mode 100644 index c9061c173b34c89a7f4e19284df1ea6def259545..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 978 zcmXxiUrbw790%}IrVr{%dn+>#=V)zJ=tv7z8--e7p$~JU*+#2DyP8o3(k;yba|?61 ziDT{#eOsiO3rjod9Ag~4ps)MadmFs#C?ffld6>O)7NH2rh=dT!O<&F^<}Kj;3= z$+`EmwlD1<<@l7=*ZxZ#z01f`W&endE1&x}cn1-yBJ-VwPD-9 zG``_(@E%b9PHm{@ylR1{Hnz5PHQ4S|upiKEY$(Gnlo(BmTwYU`mBpxizRu9z5@T%H zIjS0~cZk$N8I_wwNnw1q`3H5ZDJ`wrHOCx@qa@Qbm~W|Kdyv1(arTEAEg;G?1{opR z>a=7{$-oPesk9UP>_Hh@puNsV0W;`dc$JoIvDHu4xEM_a=r+U(ff_Q+Y4mbm+^_tt zo!Yb5MzMt)2TpT?lM0^~DAh;kK;)syj|gW8DNfmdOV5PP;_;eu){^1A$Na z2iWE3_mv*Fa@_93PM(_QyZv}mgX#T3=O*`3D!ihHsMHGhWf#yN?0d|;D9qoW?|mCb zPu?=^FY3%A!{)WSyq6l*Wo$EfPaO06&M!V%y&Z&j4Nr*8Dt{VNIOR*N@<-^Vu2a){ z$SbsAwkc_-tDVtpPp7kt%hvEVP9X8&U0GFib_X(PbQfIocpXB%JyKz;7fr~rz($Nt zQip;w%$QtTCO`+cZNQcVTNlFWT6Uw+hDra*t{z}2jx6Un;Bjrdu7P#3)wQWT+O~i# zZrsN^vqm**UQbvueY^YR&N*(#=kXSdjV!WsvK5O^qn+cpjvfJHN`Zd(a-2{ubKH6B wqJZfCgw5&)^sKdozjhq8^NXo~B0Jfs>9qUj}-vhTYx&0JlFHvH$=8 diff --git a/Graphics/ingamefx/+health_full_1.bmp b/Graphics/ingamefx/+health_full_1.bmp new file mode 100644 index 0000000000000000000000000000000000000000..c42bbbd4fdc9b53b7e9ab9dadefda35aac6a8ebb GIT binary patch literal 298 zcmZ?r)na4-gEAng0mYm^nvsD8EWQOu3UfoS0FVvB|A8-%C!3+CrI}&DjA;y; z)~;qaxPLdpxl<<@3^X+vu3fvt@bJ!Uh7Ye_F?|32p5gcR?+pL{gD_C?MwjZzAf69_CmWVyVz%o5M|CfnT{r|5(!*1H&*HAsezz~vt|Nmm) z`#=l9piuZS0|Tqu+57+Z!i4^Rkva-%C!3+CrI}&DjA;y; z)~;qaxPLdpxl<<@3^X+vu3fvt@bJ!Uh7Ye_F?|32p5gcR?+pL{gYbU_2Kj4ZtM&i? z&tB>C-%REI7N7f3Ul`=>?7FG{|F5v>{r?wb|Nk#upLK;n=KiTQKy?ex|4;vEzh(Y! zZQE&Fws-fe&IgM9|JYb>)8YMh@%-tmXV2W)y8i#)CI5eP_`6B8{@?t+eEOYRtCRl! z|F;wl`u__6S6-Hm literal 0 HcmV?d00001 diff --git a/Graphics/ingamefx/+health_full_3.bmp b/Graphics/ingamefx/+health_full_3.bmp new file mode 100644 index 0000000000000000000000000000000000000000..87e685eafb49793598d55fa54e6a13b14ed6dfaa GIT binary patch literal 298 zcmZ?r)na4-gEAng0mYm^nvsD8EWQOu3UfoS0FVvB|A8-%C!3+CrI}&DjA;y; z)~;qaxPLdpxl<<@3^X+vu3fvt@bJ!Uh7Ye_F?|32p5gcR?+pL{gYbW#38BYSRR90~ z+o)pE*wLXX_5SAs1_tZf%f&%rimIztZx3p$|5d=i5PN31El@{?I*|DH*J=LW00z#z zx0l-k)ivD*iv9m&^ZtJV1KVNI>%Ks-uK)l3|90%i{r|rJt60@W!Rh(`|Nqh54OG1Q znBx5ZyBX{^36}f+|3A5NQ|-%C!3+CrI}&DjA;y; z)~;qaxPLdpxl<<@3^X+vu3fvt@bJ!Uh7Ye_F?|32p5gcR?+pL{gYbWlx!D<#aYE<6 zidL_hWwHLdl4ySO$lMXsq9M|91gUEce$c`~UxqLInkd73V8z{Y_wC z;M{w9yZ`@x7D7g*DTeuh!uNn;EWcxC+yDQoWa8wSZ0LWmsXl;#f%&uWuK53dgj5_Q zBs8?XHtq+CF?|#Q>ir{R;wZL4aj|aLU!d5gPl_q^|NjV@c-Wj!+Hd_HWN-2jp``Qw R|1_!?+U`)?uk-)s1OUidaM}O> literal 0 HcmV?d00001 diff --git a/Graphics/ingamefx/+health_full_5.bmp b/Graphics/ingamefx/+health_full_5.bmp new file mode 100644 index 0000000000000000000000000000000000000000..375ebd11db954dab220ebf4ec9a502759da011c6 GIT binary patch literal 298 zcmZ?r)na4-gEAng0mYm^nvsD8EWQOu3UfoS0FVvB|A8-%C!3+CrI}&DjA;y; z)~;qaxPLdpxl<<@3^X+vu3fvt@bJ!Uh7Ye_F?|32p5gcR?+pL{gYbW_xeV<4r=^BE zo473t&4LIpFl<&0+y8g(|G&3)?+kHEO#lmH5#x%gS^sN4&>#>vJ!>gQ9rN$gRUak) z|5SEMalZfm|1OZ&;?=*rUI^Wvym#CB@A3ct-v)^#uRf*!NvPhgM9KXB{ontufy7)( mw%dOfzQ3taP(u6v3LUUmxJ6Wc)&2j9=Bt+r|Gy!6jR63DR(7WV literal 0 HcmV?d00001 diff --git a/makefile.gfx b/makefile.gfx index 7e583f717..27d2317f7 100644 --- a/makefile.gfx +++ b/makefile.gfx @@ -239,7 +239,9 @@ PICKUP_GFX := +spatula +pants +health100 +health50 +health25 +glint1 +glint2 +teeth +blower +net PICKUP_GFX_IN := $(foreach FILE,$(PICKUP_GFX),$(PICKUP_GFX_DIR)/$(FILE).bmp) -INGAMEFX_GFX_TRANS := +bubble_1 +bubble_2 +bubble_3 +INGAMEFX_GFX_TRANS := +bubble_1 +bubble_2 +bubble_3 \ + +health_full_1 +health_full_2 +health_full_3 +health_full_4 +health_full_5 \ + +health_empty_1 +health_empty_2 +health_empty_3 +health_empty_4 +health_empty_5 INGAMEFX_GFX_TRANS_IN := $(foreach FILE,$(INGAMEFX_GFX_TRANS),$(INGAMEFX_GFX_DIR)/$(FILE).bmp) #### diff --git a/source/player/player.cpp b/source/player/player.cpp index 18ddfa42e..4a5b2ddee 100644 --- a/source/player/player.cpp +++ b/source/player/player.cpp @@ -83,6 +83,11 @@ /* Data ---- */ +#ifndef __SPR_INGAMEFX_H__ +#include +#endif + + /*---------------------------------------------------------------------- Tyepdefs && Defines ------------------- */ @@ -391,14 +396,11 @@ else if(Pos.vy>m_mapEdge.vy-64)Pos.vy=m_mapEdge.vy-64; ---------------------------------------------------------------------- */ int panim=-1; #include "gfx\prim.h" // (pkg) -int healthx=100; -int healthy=27; -int healthw=10; -int healthh=10; -int healthg=2; -int livesx=162; -int livesy=28; - +int healthx=400; +int healthy=30; +int healthr=200; +int healthg=75; +int healthb=75; #ifdef __USER_paul__ int mouth=-1,eyes=-1; @@ -432,38 +434,49 @@ m_fontBank->print(40,40,posBuf); #endif - // Temporary health/lives thing -#ifdef __USER_paul__ - int i,x; - x=healthx; - for(i=0;i<5;i++) + // Health { - POLY_F4 *f4; - f4=GetPrimF4(); - setXYWH(f4,x,healthy,healthw,healthh); - if(i0;i--) + { + ft4=m_spriteBank->printFT4(*frames++,x,y,0,0,5); + if(i>s_health) + { + setRGB0(ft4,healthr,healthg,healthb); + } + y+=9; + } } - char lifebuf[5]; - sprintf(lifebuf,"x%d",m_lives); - m_fontBank->print(livesx,livesy,lifebuf); -#endif // Mode specific ui m_currentPlayerModeClass->renderModeUi(); diff --git a/source/player/psidle.cpp b/source/player/psidle.cpp index 1085f21ac..444fa4b9e 100644 --- a/source/player/psidle.cpp +++ b/source/player/psidle.cpp @@ -85,7 +85,7 @@ void CPlayerStateBaseIdle::thinkControl(CPlayerModeBase *_playerMode) if(_playerMode->canMoveRight()) _playerMode->setState(STATE_RUN); } - else if(controlHeld&PI_DOWN) + else if(controlDown&PI_DOWN) { _playerMode->setState(STATE_DUCK); } diff --git a/source/player/psrun.cpp b/source/player/psrun.cpp index fcc609298..20885bfdd 100644 --- a/source/player/psrun.cpp +++ b/source/player/psrun.cpp @@ -110,7 +110,7 @@ void CPlayerStateRun::think(CPlayerModeBase *_playerMode) { switchedState=_playerMode->setState(STATE_JUMP); } - if(controlHeld&PI_DOWN) + if(controlDown&PI_DOWN) { switchedState=_playerMode->setState(STATE_DUCK); } diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp index f7d597347..af06155cb 100644 --- a/users/paul/spongebob project/spongebob project.dsp +++ b/users/paul/spongebob project/spongebob project.dsp @@ -1290,10 +1290,6 @@ SOURCE=..\..\..\out\USA\include\ingamefx.h SOURCE=..\..\..\out\USA\include\trans.h # End Source File -# Begin Source File - -SOURCE=..\..\..\out\USA\include\UIGfx.h -# End Source File # End Group # End Group # End Group