From b9075b53993aae8fcf33591379760f481656d720 Mon Sep 17 00:00:00 2001 From: Daveo Date: Sat, 12 May 2001 17:24:44 +0000 Subject: [PATCH] --- Graphics/hazards/Acorn/Acorn.max | Bin 125440 -> 126464 bytes Graphics/hazards/Acorn/acorn.gin | Bin 18060 -> 18060 bytes Graphics/levels/Chapter01/Level02/Level02.MEX | Bin 788881 -> 788881 bytes Graphics/levels/Chapter01/Level02/level02.Mep | Bin 1333629 -> 1333629 bytes Graphics/levels/Chapter01/Level03/Level03.MEX | Bin 1135425 -> 1135425 bytes Graphics/levels/Chapter01/Level03/level03.Mep | Bin 1246266 -> 1246266 bytes Utils/MapEdit/LayerHazard.cpp | 3 +++ Utils/MkLevel/MkLevel.cpp | 2 +- source/frontend/fmvintro.cpp | 2 +- source/game/convo.cpp | 4 ++-- source/gfx/actor.cpp | 19 +++++++++--------- source/hazard/hfalling.cpp | 6 ++++++ source/hazard/hfalling.h | 1 + source/level/layercollision.h | 4 ++-- source/level/level.cpp | 4 +++- source/pad/pads.cpp | 4 ++-- source/player/player.h | 2 +- source/player/pmodes.h | 2 +- source/system/main.cpp | 9 ++++----- tools/Data/bin/MkLevel.exe | Bin 274432 -> 274432 bytes 20 files changed, 36 insertions(+), 26 deletions(-) diff --git a/Graphics/hazards/Acorn/Acorn.max b/Graphics/hazards/Acorn/Acorn.max index d9c9f1e7cad81d8a3fa01734785dbdba458757ac..2682a0c62ccaab8ef50c7247bf39ca2d16913ae2 100644 GIT binary patch literal 126464 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 m%{c2~`h|cqnl0EqUl@OEgUdzIj>GA&`n*wzJ literal 125440 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 diff --git a/Graphics/hazards/Acorn/acorn.gin b/Graphics/hazards/Acorn/acorn.gin index 03e045a5ae49e9c51208dc554884dea62d250e17..98db3a36cddc95f38542efa59910c7f82005221a 100644 GIT binary patch literal 18060 zcmeHP&1(}u6d%)QL<`0oq{kk5C|bpXhgh(in5CN^i2)V6F@vjj40`(vw{sG4KX6I#Qa|z@m__?0^~D;er8%W?l=3`> zD5AV!_jBs^4%JahOA(2N(a*vnn8zXkS?`5_ zC*4t4OvL{{&-m^JxQM-szRQAtfxcLKfxf^VU=Oed>?cOWfWS|{Pry&WPry%%7efdC z3I7TI3IF-O`_CnRRmV$Dkuh*A@dPoGoEx*;EC(T{ll&l(y2j<}y6+5?aSU>~(g^C5 zPEw20l%6FH54RMBDXWLsi>ldJUL{c#`9YL1%rd`M#?2ae__J_%t=!b_bjMJciTUb> z9Z&tv%!^#2JTsSZoyc5&r5@<`=_ZZG#Gixd&EEbCI_l-~yRqe(-@3;Ar};sY%qe+8 z-%wIRxQ4CNTzGz@kMSLf3#YWiy6MPqF87Dy!gaaGD}F_PH-ZO`L34g-Y+m)eE=?k z32>1$Gtmj)f^#GI39$+6Be9Rfx@r9Z>;d)wdw@OQ_XGCH|NcH%?lAIXuyTh$qNZlh z(8v5oDJONIe?y;DPnoiA`$6~qR{P$~Gq?C(Th86SyGi#9p>A{Dv`P9#-n)b9!js1* UC_PxPx8aiU$;~;jsO4v literal 18060 zcmeHPziSjh6do@@1p~%_A&n3*ML-D_DME_eU6NH#y&voy!GMj1OJ`1EBz76FvD3od z)}*vL5IKe5Um=K1Y(&If*6+>C%TA7HFrDx{c>CVYkGH$u&G%-qJLGz$HfdSr( zxBT}B*bo=u67l_TUXn+|1!ExO3g%t%fqWnz{F*T0g19zU<_Q5Lh=mPGTmmLy0wy|^ zVr=^BqF(G5aC3P$28MXLu|Zq_Ls-|7M<57zp?IhzF2sd-BIgD9KtB9Ge2{n1D#v-( zEPdJUaLyAK;sScud~W#rnu+6u|jl2lCwf5?Ux=yh3q9BfQrQLjT_~(C1pc$fM{KP{-*0Y zfil^HTwbWBHP|7vxCkrd^Mz4!3HDjxylK>LFT*u6a)1{E-GbGr@qu*tEF!LbOZ53rH3bR!Qz9@_WCsOukjSa`l&z1^3%19vVaLA2E6o zBl3Iiw|6E{?!I}eU#ojO4#sfz;`)lGasK32>x=GLO1{DV{`W5S)X#h$F_jB@n=|Dv zn*zb`aA7hu>obz0ZAtgHPmCIKGPH>IxbwY{v4ABg=QSCdUKJCu#D%zUzGt4$T%b9^ z<%N(twGJpjIIl2&Vi?#wZ|ayKF2sfFiJTYY1NlHckPlp6`#hj)2An~-j^zA+VPNz8 zz;&d@L&t^Up;pTkGqi?~N5logz#hdT{f04&#`+Bbu9HSucdz+R<4o&X$sPBudMuP} zw4ZD|UT;6Td-L(8?f8rt~2w)k;(aqh+Qv#`5!a$l>ftNSV!JST@B FzX5>powEP{ diff --git a/Graphics/levels/Chapter01/Level02/Level02.MEX b/Graphics/levels/Chapter01/Level02/Level02.MEX index ae6c774d59d15d5175e4b06129279382aabb1729..bc6b745d16fd1d7820b88d933150dde56a68d2e2 100644 GIT binary patch delta 2596 zcmeHHT}V_x6rOu$=3c#Sx~`EMiLF^8W+_s(i0P&o_7J!!A?1US;X_NUAZaSOt71MF ztZq2I1lH45B0huz3Mu_zkRb^{>4OTw)`M6`nu2v^*Ih-$=rP!VbLZUi_kCyP+}q(! z?{KF(TBH{FIqsWe4lf?%<==3%%v=f?aNDtt>k08-(Dcl;m$+E}IBp7R6d)TJ39?GEVq2##@LS&VlBv6d<9nlnETkx;3(n^kE+f6VZ1CT$jRnQmB_( zKI06Dl`r8#%=M7ySnni$y~8l#j0g~@^Pd&7ypwwP!VhdCTRI%Dkp3`Xi`mrm z_BK7(U&3T1XOD4L5?zybf5Pn)ibhsIF$NTE1Dt22(N-#IEXV=(PH_wlM`PJ(^u6!; zMMArO5`?-w6kDtxH!AY}UQ%loV0uY_D?E9Q=zOY<=Ljoz{UWJim^7|8QG*0pn6M?u z+_6mb+unKk4LM%gg>o#@r;s)%Q{e|}TPB($YAr{Jn^Xj>CIyDMEU5eqp4q*?F~}MC znXZsU!7uwC*aX{GxSyCMk>(IybeJB;;#sHeN)qPE%p7xYL_p+Ak$FB1m7ce%4X|qn zp|%x+Z}$wHLBdwGWI!`j=TI`}eG)>y8!6I5oZfvEA7%9pYQF6CG%C6$jY=|z5nLm$ ziq+B!CF;mTiE1Pl!LqT0zYW(by&$6?;$6Uds;p}19jm%9glqG&%8Ko`ZdP8;V|$!5 zGe6xOgN)7?WCv<%sTP~4*8bCgrV3|jvT3}JE->@0YM?vzY;ej0{?%(UHO>R4Y!Jg* zo%FQaUBKQrX$BF!uvI6GixgV&rvfC>!F!~MUNQ){&1=}r?l;j)O+X=JLEZv3);ukf~S}wD!={#mO?8_ delta 2667 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 diff --git a/Graphics/levels/Chapter01/Level03/Level03.MEX b/Graphics/levels/Chapter01/Level03/Level03.MEX index fd4eebc0a9a68f79bc5c13d03514cf162c6f35c9..9e305de0a843c6ba49a9e8c3e408ce0acf82eab4 100644 GIT binary patch delta 429 zcmX@O%=O?h*M=6x7N!>F7M3ln6J)11ykp^+uJDG1WBL+V)(#}DgB%L?4l38+Hw(-5 z8hO@zOxiIGY!auF+4lfxE(QjMj$c9yAbQ1aM+T5s;ddd1hlOqo89?^*R3+AezzDxC zwi+Ow0mKqOl@3~|>>-a**&VFX*d<3R(ofI$-)d0jlv8CKnMKOamWD~((_G-;f}|{aua4ju%j5ECYJymb$0cx zJ1ch&Am#vKP9Ww2Vs0Sj0b*Vt R<^y7WAQsqetSZQ-2LN4EcN72s delta 429 zcmX@O%=O?h*M=6x7N!>F7M3ln6J)0={AFRC{!^ZnfBF(x)(#}DgB%L?4l38+Hw(-5 z8hO@zOxkbt87}NU&n5$;xfmE2I(`X(=@q*j89-u%--Q?+7P>KYuAU?>p4&DoF7vwLn zeb~)h;WAxKnbqDoVS+G&N1ZT30nh>ebR2R(hV*Anim[Frame]; } /*****************************************************************************/ -sActorPool *DbgPool; +const int BBOX_ADJ=4; POLY_FT4 *CActorGfx::Render(DVECTOR &Pos,int Anim,int Frame,bool XFlip,bool YFlip) { sPoolNode *ThisNode,*FindNode; POLY_FT4 *Ft4; - DbgPool=PoolEntry; CurrentFrame=GetFrame(Anim,Frame); ThisNode=0; @@ -667,10 +666,10 @@ POLY_FT4 *Ft4; // Set BBox int HalfW=CurrentFrame->W>>1; - BBox.XMin=-HalfW; - BBox.XMax=+HalfW; - BBox.YMin=-CurrentFrame->H; - BBox.YMax=0; + BBox.XMin=-HalfW+BBOX_ADJ; + BBox.XMax=+HalfW-BBOX_ADJ; + BBox.YMin=-CurrentFrame->H+BBOX_ADJ; + BBox.YMax=0-BBOX_ADJ; return(Ft4); } @@ -729,10 +728,10 @@ int YMin,YMax; if (YMaxx0=Pos.vx+x0; Ft4->y0=Pos.vy+y0; Ft4->x1=Pos.vx+x1; Ft4->y1=Pos.vy+y1; diff --git a/source/hazard/hfalling.cpp b/source/hazard/hfalling.cpp index 2325b962e..2c5d802ba 100644 --- a/source/hazard/hfalling.cpp +++ b/source/hazard/hfalling.cpp @@ -133,3 +133,9 @@ void CNpcFallingHazard::processTimer( int _frames ) m_bounceFinish = false; } } + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +void CNpcFallingHazard::collidedWith( CThing *_thisThing ) +{ + if (!m_bounceFinish && m_movementTimer<=0) CNpcHazard::collidedWith(_thisThing); +} diff --git a/source/hazard/hfalling.h b/source/hazard/hfalling.h index ea0d87aec..4d2e9ab5f 100644 --- a/source/hazard/hfalling.h +++ b/source/hazard/hfalling.h @@ -25,6 +25,7 @@ public: protected: void processMovement( int _frames ); void processTimer( int _frames ); + virtual void collidedWith(CThing *_thisThing); s32 m_movementTimer; u8 m_bounceFinish; diff --git a/source/level/layercollision.h b/source/level/layercollision.h index 821aeecae..26be923ca 100644 --- a/source/level/layercollision.h +++ b/source/level/layercollision.h @@ -8,9 +8,9 @@ #include -//#if !defined(__USER_CDBUILD__) +#if !defined(__USER_CDBUILD__) #define __SHOW_COLLISION__ -//#endif +#endif /*****************************************************************************/ diff --git a/source/level/level.cpp b/source/level/level.cpp index 7203d90e1..6c10bd30b 100644 --- a/source/level/level.cpp +++ b/source/level/level.cpp @@ -165,7 +165,9 @@ bool Finished=false; if (Lvl>=LvlTableSize) Lvl=0; } // End TMP - Lvl&=3; // Ch1 only Bodge +/*** E3 Bodge ***/ + if (Lvl>2) Lvl=0; +/****************/ return(Finished); } diff --git a/source/pad/pads.cpp b/source/pad/pads.cpp index d246fd8d3..edd0f12e3 100644 --- a/source/pad/pads.cpp +++ b/source/pad/pads.cpp @@ -398,9 +398,9 @@ CPadConfig::sPadConfigTable CPadConfig::s_padConfigs[NUM_PAD_CONFIGS]= PAD_UP, // PAD_CFG_UP PAD_DOWN, // PAD_CFG_DOWN - PAD_CROSS, // PAD_CFG_FIRE + PAD_SQUARE, // PAD_CFG_FIRE PAD_TRIANGLE, // PAD_CFG_CATCH - PAD_SQUARE, // PAD_CFG_JUMP + PAD_CROSS, // PAD_CFG_JUMP }}, // Config B {{ diff --git a/source/player/player.h b/source/player/player.h index b34e02759..b61bbc83c 100644 --- a/source/player/player.h +++ b/source/player/player.h @@ -294,7 +294,7 @@ private: enum { INVINCIBLE_FRAMES__START=200, // Invincible for this many frames at start of life - INVINCIBLE_FRAMES__HIT=30, // Invincible for this many frames after taking damage + INVINCIBLE_FRAMES__HIT=60, // Invincible for this many frames after taking damage }; int m_invincibleFrameCount; // Initial invincibility and also invincibility after taking damage diff --git a/source/player/pmodes.h b/source/player/pmodes.h index aaee4fc8f..1a50afdf4 100644 --- a/source/player/pmodes.h +++ b/source/player/pmodes.h @@ -75,7 +75,7 @@ enum DEFAULT_PLAYER_TERMINAL_VELOCITY=8, DEFAULT_BUTT_FALL_VELOCITY=14, DEFAULT_HITREACT_XVELOCITY=5, - DEFAULT_HITREACT_YVELOCITY=3, + DEFAULT_HITREACT_YVELOCITY=3-1, DEFAULT_HITREACT_FRAMES=15, }; diff --git a/source/system/main.cpp b/source/system/main.cpp index 622d90861..c164cb99e 100644 --- a/source/system/main.cpp +++ b/source/system/main.cpp @@ -71,7 +71,7 @@ CPaulScene s_paulScene; #if __FILE_SYSTEM__==PC #if !defined(__USER_CDBUILD__) #if defined(__VERSION_DEBUG__) - #define SCREEN_GRAB + #define USE_SCREEN_UTILS #endif #endif #endif @@ -188,12 +188,11 @@ void MainLoop() dumpDebugMem(); #endif - #if defined(SCREEN_GRAB) + #if defined(USE_SCREEN_UTILS) if (PadGetHeld(0) & PAD_L2) if (PadGetDown(0) & PAD_START) SaveScreen(VidGetScreen()->Draw.clip); - #endif - if (PadGetDown(0) & PAD_SELECT) VRamViewer(); + #endif #endif } } @@ -224,7 +223,7 @@ int main() } /*****************************************************************************/ -#if defined(SCREEN_GRAB) +#if defined(USE_SCREEN_UTILS) #if defined(__VERSION_DEBUG__) struct sTgaHdr { diff --git a/tools/Data/bin/MkLevel.exe b/tools/Data/bin/MkLevel.exe index b038d7db6afc6383d56ff41f61941bf40dc95235..9e1e532d261f702ddd3bbd261776e160674a2bcc 100644 GIT binary patch delta 191 zcmZp8AkgqYU;!g@m+7C)%#1blj8T&t8lprx7#JA3TU2g9Mu{AUsQwQG XFP2Zf(x}zc)Yin<*2J`|iFq9WZbwJn delta 194 zcmZp8AkgqYU;!iZqWqtmnHg*986ze)G(?HCF)%Q6x2W6zQ6COIV`2W#yL