Decompile chrGetTimer

This commit is contained in:
Ryan Dwyer
2020-02-16 22:28:47 +10:00
parent 4f8b650f8a
commit 7f9f31e431
4 changed files with 148 additions and 114 deletions
+5 -5
View File
@@ -6,11 +6,11 @@
#define false 0
#define true 1
#define ABS(val) (val > 0 ? val : -val)
#define CHRRACE(chr) (chr ? chr->race : RACE_HUMAN)
#define PLAYERCOUNT() ((g_Vars.players[0] ? 1 : 0) + (g_Vars.players[1] ? 1 : 0) + (g_Vars.players[2] ? 1 : 0) + (g_Vars.players[3] ? 1 : 0))
#define PLAYERCOUNT3012() ((g_Vars.players[3] ? 1 : 0) + (g_Vars.players[0] ? 1 : 0) + (g_Vars.players[1] ? 1 : 0) + (g_Vars.players[2] ? 1 : 0))
#define ABS(val) (val > 0 ? val : -val)
#define CHRRACE(chr) (chr ? chr->race : RACE_HUMAN)
#define FRAMEDURATION (1 / 60.0f)
#define PLAYERCOUNT() ((g_Vars.players[0] ? 1 : 0) + (g_Vars.players[1] ? 1 : 0) + (g_Vars.players[2] ? 1 : 0) + (g_Vars.players[3] ? 1 : 0))
#define PLAYERCOUNT3012() ((g_Vars.players[3] ? 1 : 0) + (g_Vars.players[0] ? 1 : 0) + (g_Vars.players[1] ? 1 : 0) + (g_Vars.players[2] ? 1 : 0))
#define SECSTOFRAMES240(secs) (secs * 240)
// These actions are assigned to chr->actiontype
+1 -1
View File
@@ -542,7 +542,7 @@ struct chrdata {
/*0x113*/ u8 alertness;
/*0x114*/ u32 flags;
/*0x118*/ u32 flags2;
/*0x11c*/ u32 timer60;
/*0x11c*/ s32 timer60;
/*0x120*/ s32 soundtimer;
/*0x124*/ u8 random;
/*0x125*/ u8 team;