From 7ff576adf4681b8421a13c8a7160af8884149d65 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 27 Jun 2006 23:49:45 +0000 Subject: [PATCH] - Fixed: P_UndoPlayerMorph didn't properly transfer the inventory. It just copied the pointer instead of using ObtainInventory. SVN r230 (trunk) --- docs/rh-log.txt | 6 ++++++ src/g_raven/a_artiegg.cpp | 3 +-- src/win32/i_crash.cpp | 2 +- wadsrc/iceca0.png | Bin 191 -> 202 bytes wadsrc/icecb0.png | Bin 186 -> 194 bytes wadsrc/icecc0.png | Bin 151 -> 164 bytes wadsrc/icecd0.png | Bin 114 -> 125 bytes 7 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 9cc14dd32..dc1a79636 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,3 +1,7 @@ +June 27, 2006 (Changes by Graf Zahl) +- Fixed: P_UndoPlayerMorph didn't properly transfer the inventory. It just + copied the pointer instead of using ObtainInventory. + June 24, 2006 - Moved the version resource into the "compile-time directives" section of the resource script so that Developer Studio won't replace the version macros @@ -8,6 +12,8 @@ June 24, 2006 (Changes by Graf Zahl) - Fixed: PIT_CheckThing checked AActor::tid instead of TidToHate to determine whether a monster of the same species can be hurt. - Added new ice chunk sprites submitted by Enjay. +- Replaced all occurences of 'ZDoom' in i_crash.cpp with a define from version.h + so that this file doesn't need to be changed for altering the texts. - Deleted the programmer death script from strifehelp.acs because it is no longer used. - Fixed: strfhelp.acs and the PUMPUPS cheat need to give 10 UpgradeStaminas diff --git a/src/g_raven/a_artiegg.cpp b/src/g_raven/a_artiegg.cpp index a0f6df3a2..c097b31c1 100644 --- a/src/g_raven/a_artiegg.cpp +++ b/src/g_raven/a_artiegg.cpp @@ -128,6 +128,7 @@ bool P_UndoPlayerMorph (player_t *player, bool force) } pmo->player = NULL; + mo->ObtainInventory (pmo); DObject::PointerSubstitution (pmo, mo); mo->angle = pmo->angle; mo->player = player; @@ -161,8 +162,6 @@ bool P_UndoPlayerMorph (player_t *player, bool force) angle = mo->angle >> ANGLETOFINESHIFT; Spawn (pmo->x + 20*finecosine[angle], pmo->y + 20*finesine[angle], pmo->z + TELEFOGHEIGHT); - mo->Inventory = pmo->Inventory; - pmo->Inventory = NULL; beastweap = player->ReadyWeapon; if (player->PremorphWeapon != NULL) { diff --git a/src/win32/i_crash.cpp b/src/win32/i_crash.cpp index 3b4ee32a5..6a3803c90 100644 --- a/src/win32/i_crash.cpp +++ b/src/win32/i_crash.cpp @@ -1200,7 +1200,7 @@ static HANDLE MakeZip () central.LocalHeaderOffset = LittleLong(TarFiles[i].ZipOffset); WriteFile (file, ¢ral, sizeof(central), &len, NULL); WriteFile (file, TarFiles[i].Filename, (DWORD)namelen, &len, NULL); - dirsize += sizeof(central) + namelen; + dirsize += DWORD(sizeof(central) + namelen); } // Write the directory terminator diff --git a/wadsrc/iceca0.png b/wadsrc/iceca0.png index afa57a4169f277f51ba55ce71ee02b8b7bdb6390..bc94b0426e715f55002c0e8ae870ec4e32127ce1 100644 GIT binary patch delta 186 zcmdnbc#3g?L_G&H0|Uc%m3b{dN-Mx8#PvVJ|E`YtO%2oYa+=FZy4_r&r%hSCX~Xel zOLqJDBeWU6Jy=nBiG4%U;?-qE iKAT*U_bz{Ogjq>};ZvN*{2M@H7(8A5T-G@yGywqA(M7ZX delta 175 zcmX@bxSw%?L_G^L0|SH6mEu+)#ggvm>&U>cv7h@-A}f%u72p%%`k&!{R7Ad&h5w`p z%k^}emo3>nZOUplm*}#RZa<&oO&g9kHB8UTY3}NnAFk#BGKH}u$S;_|;n|HeAjjC# z#WAGfR&qi@5(DEgPK8OoRXWz(Eo^99xJ>s)AM;_2p6J!nWD{4!R+<0iJA6lW`F9Zp ZhOZC!pLv>Bcmwq_c)I$ztaD0e0sumGL1h2{ diff --git a/wadsrc/icecb0.png b/wadsrc/icecb0.png index b2f12eb956e77d8d2444745d781a6cf9147fff5c..927a145454317c8d6b883d89bf34963238fd214a 100644 GIT binary patch delta 178 zcmdnRc!+U=L_G&H0|Ucb*Xcn(NF(;7uczZYZ_Z{Z3H|0ref&Tzj3q&S!3+-1ZlnP@9O*@lNkEzvh}o}Lly3#nrk*a2 zAr*0|C!)m~6a<(88Y`oI$LBBp$oPFj-nX~m+D@`58(%!1lex_;u_nXvjzJZ}YjxgV Z3^Gg%*ABQD830XS@O1TaS?83{1OQH0J{SN1 delta 170 zcmX@axQlUuL_G^L0|SG`)~aA2#ggvm>&U>cv7h@-A}f%u9^ez=`k&#yl!X4gIh*}_ zl9Lk3yE^7io3dI@$GNPe+seW}FQ+*wBEP9&x+%ljKA;xHk|4ie28U-i(tsR8PZ!6K zid)GE2?^;yJZC4fN7NjPumcA!Os*90x@_d$w SurCGbX7F_Nb6Mw<&;$Uiq&ji{ diff --git a/wadsrc/icecc0.png b/wadsrc/icecc0.png index 36982937215aaf2f1f88379c31aee05f0ad4c2ea..06800214826ad4a8e44dcddfae6b4f551ca87ed3 100644 GIT binary patch delta 148 zcmbQvxP)2%DmJERkSTe#wT4!4}A4AUeAhfJ-*yj(!V44$rjF6*2UngE0(FvS1> delta 134 zcmZ3&IGu5VL_G^L0|Ud_w;bPq6id3JuOkD)#(wTUiL5}rT!2rA>wkv-T^;kMOGS4n&dX^|N+|d9Nw%`^XZv>85~z}~B*-tA!Qt7BG$2RZ)5S5Q;#P9PgEa{W j4}8Ls6K2T0Fl1!lXJfj;E>b4}RKnot>gTe~DWM4fBzY~O diff --git a/wadsrc/icecd0.png b/wadsrc/icecd0.png index 36da94d81bbd7482f726d45b99141483b106b383..63d3136e580a0b29a832395e44bcff54447e39ef 100644 GIT binary patch delta 106 zcmXS_ogk6Q!OXzGuxiyb4IsrI;1l8+6_Kx}`>6_Kx} u;~d2PYZ*|A&(p;*q~ca`K~aK13IhYvCWb8&s(plkG7O%selF{r5}E+z3makp