Fix merges

(Don't bother me hastily to merge something in again, please)
This commit is contained in:
TehRealSalt committed 2018-10-24 21:51:43 -04:00
1 parent af4e4f3fe4
commit aa00ca72e2
2 files changed
+6 -2

No files matched your search

+4
View File
@@ -17648,6 +17648,10 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
16<<FRACBITS, // speed
20<<FRACBITS, // radius
20<<FRACBITS, // height
0, // display offset
0, // mass
0, // damage
sfx_None, // activesound
MF_SCENERY|MF_NOCLIP|MF_NOGRAVITY, // flags
S_NULL // raisestate
},
+2 -2
View File
@@ -8830,9 +8830,9 @@ void A_ReaperThinker(mobj_t *actor)
thinker_t *th;
//Player targetting stuff:
INT32 maxscore = 0; // we target the player with the highest score so yeah there you go.
UINT32 maxscore = 0; // we target the player with the highest score so yeah there you go.
player_t *player; // used as a shortcut in a loop.
mobj_t *targetplayermo; // the player mo we can eventually target, or whatever.
mobj_t *targetplayermo = NULL; // the player mo we can eventually target, or whatever.
#ifdef HAVE_BLUA