From 13bea28fec88686e7ef794710e3905ca66653fbd Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 29 May 2025 05:32:31 +0200 Subject: [PATCH] Revert "Merge branch 'fixgnu23' into Saturn-Testing" This reverts commit face5cf44741ecc8bc6e0ab76319de403ef94d15, reversing changes made to 603267b753ff60eaefdf9fcff7686828ed67c912. --- src/am_map.c | 2 - src/d_netcmd.c | 8 +- src/d_think.h | 9 +- src/dehacked.c | 435 ++-- src/discord.c | 2 +- src/doomtype.h | 24 +- src/g_game.c | 63 +- src/hardware/hw_cache.c | 2 +- src/info.c | 5367 ++++++++++++++++++++------------------- src/info.h | 407 +-- src/k_kart.c | 42 +- src/lua_infolib.c | 14 +- src/lua_mathlib.c | 2 +- src/lua_script.c | 6 +- src/lua_thinkerlib.c | 8 +- src/m_cheat.c | 2 +- src/m_menu.c | 5 +- src/m_perfstats.c | 16 +- src/p_ceilng.c | 4 +- src/p_enemy.c | 1893 +++++++------- src/p_floor.c | 14 +- src/p_inter.c | 16 +- src/p_lights.c | 12 +- src/p_local.h | 2 +- src/p_map.c | 4 +- src/p_mobj.c | 106 +- src/p_polyobj.c | 26 +- src/p_saveg.c | 134 +- src/p_spec.c | 67 +- src/p_tick.c | 30 +- src/p_user.c | 26 +- src/r_data.c | 2 +- src/s_sound.c | 3 +- src/sdl/mixer_sound.c | 10 +- 34 files changed, 4346 insertions(+), 4417 deletions(-) diff --git a/src/am_map.c b/src/am_map.c index 1478b37f9..f91273e8b 100644 --- a/src/am_map.c +++ b/src/am_map.c @@ -318,13 +318,11 @@ static void AM_initVariables(void) break; plr = &players[pnum]; - if (plr != NULL && plr->mo != NULL) { m_x = (plr->mo->x >> FRACTOMAPBITS) - m_w/2; m_y = (plr->mo->y >> FRACTOMAPBITS) - m_h/2; } - AM_changeWindowLoc(); // for saving & restoring diff --git a/src/d_netcmd.c b/src/d_netcmd.c index b36436def..ceb2c2e3c 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -2114,18 +2114,14 @@ static INT32 LookupPlayer(const char *s) static INT32 FindPlayerByPlace(INT32 place) { INT32 playernum; - for (playernum = 0; playernum < MAXPLAYERS; ++playernum) + if (playeringame[playernum]) { - if (!playeringame[playernum]) - continue; - if (players[playernum].kartstuff[k_position] == place) { return playernum; } } - return -1; } @@ -5677,7 +5673,7 @@ static void Command_Archivetest_f(void) // assign mobjnum i = 1; for (th = thinkercap.next; th != &thinkercap; th = th->next) - if (th->function == (actionf_p1)P_MobjThinker) + if (th->function.acp1 == (actionf_p1)P_MobjThinker) ((mobj_t *)th)->mobjnum = i++; // allocate buffer diff --git a/src/d_think.h b/src/d_think.h index 1ef2577dc..8177f464d 100644 --- a/src/d_think.h +++ b/src/d_think.h @@ -28,11 +28,18 @@ // To compile this as "ANSI C with classes" we will need to handle the various // action functions cleanly. // +typedef void (*actionf_v)(); typedef void (*actionf_p1)(void *); +typedef union +{ + actionf_v acv; + actionf_p1 acp1; +} actionf_t; + // Historically, "think_t" is yet another function pointer to a routine // to handle an actor. -typedef actionf_p1 think_t; +typedef actionf_t think_t; // Doubly linked list of actors. typedef struct thinker_s diff --git a/src/dehacked.c b/src/dehacked.c index f1f31fbbf..915907192 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -1423,212 +1423,211 @@ static void readhuditem(MYFILE *f, INT32 num) // DO NOT FORGET TO SYNC THIS LIST WITH THE ACTIONNUM ENUM IN INFO.H actionpointer_t actionpointers[] = { - {A_Explode, "A_EXPLODE"}, - {A_Pain, "A_PAIN"}, - {A_Fall, "A_FALL"}, - {A_MonitorPop, "A_MONITORPOP"}, - {A_Look, "A_LOOK"}, - {A_Chase, "A_CHASE"}, - {A_FaceStabChase, "A_FACESTABCHASE"}, - {A_FaceTarget, "A_FACETARGET"}, - {A_FaceTracer, "A_FACETRACER"}, - {A_Scream, "A_SCREAM"}, - {A_BossDeath, "A_BOSSDEATH"}, - {A_CustomPower, "A_CUSTOMPOWER"}, - {A_GiveWeapon, "A_GIVEWEAPON"}, - {A_RingShield, "A_RINGSHIELD"}, - {A_RingBox, "A_RINGBOX"}, - {A_Invincibility, "A_INVINCIBILITY"}, - {A_SuperSneakers, "A_SUPERSNEAKERS"}, - {A_BunnyHop, "A_BUNNYHOP"}, - {A_BubbleSpawn, "A_BUBBLESPAWN"}, - {A_FanBubbleSpawn, "A_FANBUBBLESPAWN"}, - {A_BubbleRise, "A_BUBBLERISE"}, - {A_BubbleCheck, "A_BUBBLECHECK"}, - {A_AwardScore, "A_AWARDSCORE"}, - {A_ExtraLife, "A_EXTRALIFE"}, - {A_BombShield, "A_BOMBSHIELD"}, - {A_JumpShield, "A_JUMPSHIELD"}, - {A_WaterShield, "A_WATERSHIELD"}, - {A_ForceShield, "A_FORCESHIELD"}, - {A_PityShield, "A_PITYSHIELD"}, - {A_GravityBox, "A_GRAVITYBOX"}, - {A_ScoreRise, "A_SCORERISE"}, - {A_ParticleSpawn, "A_PARTICLESPAWN"}, - {A_AttractChase, "A_ATTRACTCHASE"}, - {A_DropMine, "A_DROPMINE"}, - {A_FishJump, "A_FISHJUMP"}, - {A_ThrownRing, "A_THROWNRING"}, - {A_GrenadeRing, "A_GRENADERING"}, // SRB2kart - {A_SetSolidSteam, "A_SETSOLIDSTEAM"}, - {A_UnsetSolidSteam, "A_UNSETSOLIDSTEAM"}, - {A_SignPlayer, "A_SIGNPLAYER"}, - {A_OverlayThink, "A_OVERLAYTHINK"}, - {A_JetChase, "A_JETCHASE"}, - {A_JetbThink, "A_JETBTHINK"}, - {A_JetgThink, "A_JETGTHINK"}, - {A_JetgShoot, "A_JETGSHOOT"}, - {A_ShootBullet, "A_SHOOTBULLET"}, - {A_MinusDigging, "A_MINUSDIGGING"}, - {A_MinusPopup, "A_MINUSPOPUP"}, - {A_MinusCheck, "A_MINUSCHECK"}, - {A_ChickenCheck, "A_CHICKENCHECK"}, - {A_MouseThink, "A_MOUSETHINK"}, - {A_DetonChase, "A_DETONCHASE"}, - {A_CapeChase, "A_CAPECHASE"}, - {A_RotateSpikeBall, "A_ROTATESPIKEBALL"}, - {A_SlingAppear, "A_SLINGAPPEAR"}, - {A_MaceRotate, "A_MACEROTATE"}, - {A_UnidusBall, "A_UNIDUSBALL"}, - {A_RockSpawn, "A_ROCKSPAWN"}, - {A_SetFuse, "A_SETFUSE"}, - {A_CrawlaCommanderThink, "A_CRAWLACOMMANDERTHINK"}, - {A_SmokeTrailer, "A_SMOKETRAILER"}, - {A_RingExplode, "A_RINGEXPLODE"}, - {A_OldRingExplode, "A_OLDRINGEXPLODE"}, - {A_MixUp, "A_MIXUP"}, - {A_RecyclePowers, "A_RECYCLEPOWERS"}, - {A_Boss1Chase, "A_BOSS1CHASE"}, - {A_FocusTarget, "A_FOCUSTARGET"}, - {A_Boss2Chase, "A_BOSS2CHASE"}, - {A_Boss2Pogo, "A_BOSS2POGO"}, - {A_BossZoom, "A_BOSSZOOM"}, - {A_BossScream, "A_BOSSSCREAM"}, - {A_Boss2TakeDamage, "A_BOSS2TAKEDAMAGE"}, - {A_Boss7Chase, "A_BOSS7CHASE"}, - {A_GoopSplat, "A_GOOPSPLAT"}, - {A_Boss2PogoSFX, "A_BOSS2POGOSFX"}, - {A_Boss2PogoTarget, "A_BOSS2POGOTARGET"}, - {A_BossJetFume, "A_BOSSJETFUME"}, - {A_EggmanBox, "A_EGGMANBOX"}, - {A_TurretFire, "A_TURRETFIRE"}, - {A_SuperTurretFire, "A_SUPERTURRETFIRE"}, - {A_TurretStop, "A_TURRETSTOP"}, - {A_JetJawRoam, "A_JETJAWROAM"}, - {A_JetJawChomp, "A_JETJAWCHOMP"}, - {A_PointyThink, "A_POINTYTHINK"}, - {A_CheckBuddy, "A_CHECKBUDDY"}, - {A_HoodThink, "A_HOODTHINK"}, - {A_ArrowCheck, "A_ARROWCHECK"}, - {A_SnailerThink, "A_SNAILERTHINK"}, - {A_SharpChase, "A_SHARPCHASE"}, - {A_SharpSpin, "A_SHARPSPIN"}, - {A_VultureVtol, "A_VULTUREVTOL"}, - {A_VultureCheck, "A_VULTURECHECK"}, - {A_SkimChase, "A_SKIMCHASE"}, - {A_1upThinker, "A_1UPTHINKER"}, - {A_SkullAttack, "A_SKULLATTACK"}, - {A_LobShot, "A_LOBSHOT"}, - {A_FireShot, "A_FIRESHOT"}, - {A_SuperFireShot, "A_SUPERFIRESHOT"}, - {A_BossFireShot, "A_BOSSFIRESHOT"}, - {A_Boss7FireMissiles, "A_BOSS7FIREMISSILES"}, - {A_Boss1Laser, "A_BOSS1LASER"}, - {A_Boss4Reverse, "A_BOSS4REVERSE"}, - {A_Boss4SpeedUp, "A_BOSS4SPEEDUP"}, - {A_Boss4Raise, "A_BOSS4RAISE"}, - {A_SparkFollow, "A_SPARKFOLLOW"}, - {A_BuzzFly, "A_BUZZFLY"}, - {A_GuardChase, "A_GUARDCHASE"}, - {A_EggShield, "A_EGGSHIELD"}, - {A_SetReactionTime, "A_SETREACTIONTIME"}, - {A_Boss1Spikeballs, "A_BOSS1SPIKEBALLS"}, - {A_Boss3TakeDamage, "A_BOSS3TAKEDAMAGE"}, - {A_Boss3Path, "A_BOSS3PATH"}, - {A_LinedefExecute, "A_LINEDEFEXECUTE"}, - {A_PlaySeeSound, "A_PLAYSEESOUND"}, - {A_PlayAttackSound, "A_PLAYATTACKSOUND"}, - {A_PlayActiveSound, "A_PLAYACTIVESOUND"}, - {A_SpawnObjectAbsolute, "A_SPAWNOBJECTABSOLUTE"}, - {A_SpawnObjectRelative, "A_SPAWNOBJECTRELATIVE"}, - {A_ChangeAngleRelative, "A_CHANGEANGLERELATIVE"}, - {A_ChangeAngleAbsolute, "A_CHANGEANGLEABSOLUTE"}, - {A_PlaySound, "A_PLAYSOUND"}, - {A_FindTarget, "A_FINDTARGET"}, - {A_FindTracer, "A_FINDTRACER"}, - {A_SetTics, "A_SETTICS"}, - {A_SetRandomTics, "A_SETRANDOMTICS"}, - {A_ChangeColorRelative, "A_CHANGECOLORRELATIVE"}, - {A_ChangeColorAbsolute, "A_CHANGECOLORABSOLUTE"}, - {A_MoveRelative, "A_MOVERELATIVE"}, - {A_MoveAbsolute, "A_MOVEABSOLUTE"}, - {A_Thrust, "A_THRUST"}, - {A_ZThrust, "A_ZTHRUST"}, - {A_SetTargetsTarget, "A_SETTARGETSTARGET"}, - {A_SetObjectFlags, "A_SETOBJECTFLAGS"}, - {A_SetObjectFlags2, "A_SETOBJECTFLAGS2"}, - {A_RandomState, "A_RANDOMSTATE"}, - {A_RandomStateRange, "A_RANDOMSTATERANGE"}, - {A_DualAction, "A_DUALACTION"}, - {A_RemoteAction, "A_REMOTEACTION"}, - {A_ToggleFlameJet, "A_TOGGLEFLAMEJET"}, - {A_ItemPop, "A_ITEMPOP"}, // SRB2kart - {A_JawzChase, "A_JAWZCHASE"}, // SRB2kart - {A_JawzExplode, "A_JAWZEXPLODE"}, // SRB2kart - {A_SPBChase, "A_SPBCHASE"}, // SRB2kart - {A_MineExplode, "A_MINEEXPLODE"}, // SRB2kart - {A_BallhogExplode, "A_BALLHOGEXPLODE"}, // SRB2kart - {A_LightningFollowPlayer,"A_LIGHTNINGFOLLOWPLAYER"}, //SRB2kart - {A_FZBoomFlash, "A_FZBOOMFLASH"}, //SRB2kart - {A_FZBoomSmoke, "A_FZBOOMSMOKE"}, //SRB2kart - {A_RandomShadowFrame, "A_RANDOMSHADOWFRAME"}, //SRB2kart - {A_RoamingShadowThinker, "A_ROAMINGSHADOWTHINKER"}, //SRB2kart - {A_MayonakaArrow, "A_MAYONAKAARROW"}, //SRB2kart - {A_ReaperThinker, "A_REAPERTHINKER"}, //SRB2kart - {A_MementosTPParticles, "A_MEMENTOSTPPARTICLES"}, //SRB2kart - {A_FlameParticle, "A_FLAMEPARTICLE"}, // SRB2kart - {A_OrbitNights, "A_ORBITNIGHTS"}, - {A_GhostMe, "A_GHOSTME"}, - {A_SetObjectState, "A_SETOBJECTSTATE"}, - {A_SetObjectTypeState, "A_SETOBJECTTYPESTATE"}, - {A_KnockBack, "A_KNOCKBACK"}, - {A_PushAway, "A_PUSHAWAY"}, - {A_RingDrain, "A_RINGDRAIN"}, - {A_SplitShot, "A_SPLITSHOT"}, - {A_MissileSplit, "A_MISSILESPLIT"}, - {A_MultiShot, "A_MULTISHOT"}, - {A_InstaLoop, "A_INSTALOOP"}, - {A_Custom3DRotate, "A_CUSTOM3DROTATE"}, - {A_SearchForPlayers, "A_SEARCHFORPLAYERS"}, - {A_CheckRandom, "A_CHECKRANDOM"}, - {A_CheckTargetRings, "A_CHECKTARGETRINGS"}, - {A_CheckRings, "A_CHECKRINGS"}, - {A_CheckTotalRings, "A_CHECKTOTALRINGS"}, - {A_CheckHealth, "A_CHECKHEALTH"}, - {A_CheckRange, "A_CHECKRANGE"}, - {A_CheckHeight, "A_CHECKHEIGHT"}, - {A_CheckTrueRange, "A_CHECKTRUERANGE"}, - {A_CheckThingCount, "A_CHECKTHINGCOUNT"}, - {A_CheckAmbush, "A_CHECKAMBUSH"}, - {A_CheckCustomValue, "A_CHECKCUSTOMVALUE"}, - {A_CheckCusValMemo, "A_CHECKCUSVALMEMO"}, - {A_SetCustomValue, "A_SETCUSTOMVALUE"}, - {A_UseCusValMemo, "A_USECUSVALMEMO"}, - {A_RelayCustomValue, "A_RELAYCUSTOMVALUE"}, - {A_CusValAction, "A_CUSVALACTION"}, - {A_ForceStop, "A_FORCESTOP"}, - {A_ForceWin, "A_FORCEWIN"}, - {A_SpikeRetract, "A_SPIKERETRACT"}, - {A_InfoState, "A_INFOSTATE"}, - {A_Repeat, "A_REPEAT"}, - {A_SetScale, "A_SETSCALE"}, - {A_RemoteDamage, "A_REMOTEDAMAGE"}, - {A_HomingChase, "A_HOMINGCHASE"}, - {A_TrapShot, "A_TRAPSHOT"}, - {A_VileTarget, "A_VILETARGET"}, - {A_VileAttack, "A_VILEATTACK"}, - {A_VileFire, "A_VILEFIRE"}, - {A_BrakChase, "A_BRAKCHASE"}, - {A_BrakFireShot, "A_BRAKFIRESHOT"}, - {A_BrakLobShot, "A_BRAKLOBSHOT"}, - {A_NapalmScatter, "A_NAPALMSCATTER"}, - {A_SpawnFreshCopy, "A_SPAWNFRESHCOPY"}, - //{A_InvincSparkleRotate, "A_INVINCSPARKLEROTATE"}, + {{A_Explode}, "A_EXPLODE"}, + {{A_Pain}, "A_PAIN"}, + {{A_Fall}, "A_FALL"}, + {{A_MonitorPop}, "A_MONITORPOP"}, + {{A_Look}, "A_LOOK"}, + {{A_Chase}, "A_CHASE"}, + {{A_FaceStabChase}, "A_FACESTABCHASE"}, + {{A_FaceTarget}, "A_FACETARGET"}, + {{A_FaceTracer}, "A_FACETRACER"}, + {{A_Scream}, "A_SCREAM"}, + {{A_BossDeath}, "A_BOSSDEATH"}, + {{A_CustomPower}, "A_CUSTOMPOWER"}, + {{A_GiveWeapon}, "A_GIVEWEAPON"}, + {{A_RingShield}, "A_RINGSHIELD"}, + {{A_RingBox}, "A_RINGBOX"}, + {{A_Invincibility}, "A_INVINCIBILITY"}, + {{A_SuperSneakers}, "A_SUPERSNEAKERS"}, + {{A_BunnyHop}, "A_BUNNYHOP"}, + {{A_BubbleSpawn}, "A_BUBBLESPAWN"}, + {{A_FanBubbleSpawn}, "A_FANBUBBLESPAWN"}, + {{A_BubbleRise}, "A_BUBBLERISE"}, + {{A_BubbleCheck}, "A_BUBBLECHECK"}, + {{A_AwardScore}, "A_AWARDSCORE"}, + {{A_ExtraLife}, "A_EXTRALIFE"}, + {{A_BombShield}, "A_BOMBSHIELD"}, + {{A_JumpShield}, "A_JUMPSHIELD"}, + {{A_WaterShield}, "A_WATERSHIELD"}, + {{A_ForceShield}, "A_FORCESHIELD"}, + {{A_PityShield}, "A_PITYSHIELD"}, + {{A_GravityBox}, "A_GRAVITYBOX"}, + {{A_ScoreRise}, "A_SCORERISE"}, + {{A_ParticleSpawn}, "A_PARTICLESPAWN"}, + {{A_AttractChase}, "A_ATTRACTCHASE"}, + {{A_DropMine}, "A_DROPMINE"}, + {{A_FishJump}, "A_FISHJUMP"}, + {{A_ThrownRing}, "A_THROWNRING"}, + {{A_GrenadeRing}, "A_GRENADERING"}, // SRB2kart + {{A_SetSolidSteam}, "A_SETSOLIDSTEAM"}, + {{A_UnsetSolidSteam}, "A_UNSETSOLIDSTEAM"}, + {{A_SignPlayer}, "A_SIGNPLAYER"}, + {{A_OverlayThink}, "A_OVERLAYTHINK"}, + {{A_JetChase}, "A_JETCHASE"}, + {{A_JetbThink}, "A_JETBTHINK"}, + {{A_JetgThink}, "A_JETGTHINK"}, + {{A_JetgShoot}, "A_JETGSHOOT"}, + {{A_ShootBullet}, "A_SHOOTBULLET"}, + {{A_MinusDigging}, "A_MINUSDIGGING"}, + {{A_MinusPopup}, "A_MINUSPOPUP"}, + {{A_MinusCheck}, "A_MINUSCHECK"}, + {{A_ChickenCheck}, "A_CHICKENCHECK"}, + {{A_MouseThink}, "A_MOUSETHINK"}, + {{A_DetonChase}, "A_DETONCHASE"}, + {{A_CapeChase}, "A_CAPECHASE"}, + {{A_RotateSpikeBall}, "A_ROTATESPIKEBALL"}, + {{A_SlingAppear}, "A_SLINGAPPEAR"}, + {{A_MaceRotate}, "A_MACEROTATE"}, + {{A_UnidusBall}, "A_UNIDUSBALL"}, + {{A_RockSpawn}, "A_ROCKSPAWN"}, + {{A_SetFuse}, "A_SETFUSE"}, + {{A_CrawlaCommanderThink}, "A_CRAWLACOMMANDERTHINK"}, + {{A_SmokeTrailer}, "A_SMOKETRAILER"}, + {{A_RingExplode}, "A_RINGEXPLODE"}, + {{A_OldRingExplode}, "A_OLDRINGEXPLODE"}, + {{A_MixUp}, "A_MIXUP"}, + {{A_RecyclePowers}, "A_RECYCLEPOWERS"}, + {{A_Boss1Chase}, "A_BOSS1CHASE"}, + {{A_FocusTarget}, "A_FOCUSTARGET"}, + {{A_Boss2Chase}, "A_BOSS2CHASE"}, + {{A_Boss2Pogo}, "A_BOSS2POGO"}, + {{A_BossZoom}, "A_BOSSZOOM"}, + {{A_BossScream}, "A_BOSSSCREAM"}, + {{A_Boss2TakeDamage}, "A_BOSS2TAKEDAMAGE"}, + {{A_Boss7Chase}, "A_BOSS7CHASE"}, + {{A_GoopSplat}, "A_GOOPSPLAT"}, + {{A_Boss2PogoSFX}, "A_BOSS2POGOSFX"}, + {{A_Boss2PogoTarget}, "A_BOSS2POGOTARGET"}, + {{A_BossJetFume}, "A_BOSSJETFUME"}, + {{A_EggmanBox}, "A_EGGMANBOX"}, + {{A_TurretFire}, "A_TURRETFIRE"}, + {{A_SuperTurretFire}, "A_SUPERTURRETFIRE"}, + {{A_TurretStop}, "A_TURRETSTOP"}, + {{A_JetJawRoam}, "A_JETJAWROAM"}, + {{A_JetJawChomp}, "A_JETJAWCHOMP"}, + {{A_PointyThink}, "A_POINTYTHINK"}, + {{A_CheckBuddy}, "A_CHECKBUDDY"}, + {{A_HoodThink}, "A_HOODTHINK"}, + {{A_ArrowCheck}, "A_ARROWCHECK"}, + {{A_SnailerThink}, "A_SNAILERTHINK"}, + {{A_SharpChase}, "A_SHARPCHASE"}, + {{A_SharpSpin}, "A_SHARPSPIN"}, + {{A_VultureVtol}, "A_VULTUREVTOL"}, + {{A_VultureCheck}, "A_VULTURECHECK"}, + {{A_SkimChase}, "A_SKIMCHASE"}, + {{A_1upThinker}, "A_1UPTHINKER"}, + {{A_SkullAttack}, "A_SKULLATTACK"}, + {{A_LobShot}, "A_LOBSHOT"}, + {{A_FireShot}, "A_FIRESHOT"}, + {{A_SuperFireShot}, "A_SUPERFIRESHOT"}, + {{A_BossFireShot}, "A_BOSSFIRESHOT"}, + {{A_Boss7FireMissiles}, "A_BOSS7FIREMISSILES"}, + {{A_Boss1Laser}, "A_BOSS1LASER"}, + {{A_Boss4Reverse}, "A_BOSS4REVERSE"}, + {{A_Boss4SpeedUp}, "A_BOSS4SPEEDUP"}, + {{A_Boss4Raise}, "A_BOSS4RAISE"}, + {{A_SparkFollow}, "A_SPARKFOLLOW"}, + {{A_BuzzFly}, "A_BUZZFLY"}, + {{A_GuardChase}, "A_GUARDCHASE"}, + {{A_EggShield}, "A_EGGSHIELD"}, + {{A_SetReactionTime}, "A_SETREACTIONTIME"}, + {{A_Boss1Spikeballs}, "A_BOSS1SPIKEBALLS"}, + {{A_Boss3TakeDamage}, "A_BOSS3TAKEDAMAGE"}, + {{A_Boss3Path}, "A_BOSS3PATH"}, + {{A_LinedefExecute}, "A_LINEDEFEXECUTE"}, + {{A_PlaySeeSound}, "A_PLAYSEESOUND"}, + {{A_PlayAttackSound}, "A_PLAYATTACKSOUND"}, + {{A_PlayActiveSound}, "A_PLAYACTIVESOUND"}, + {{A_SpawnObjectAbsolute}, "A_SPAWNOBJECTABSOLUTE"}, + {{A_SpawnObjectRelative}, "A_SPAWNOBJECTRELATIVE"}, + {{A_ChangeAngleRelative}, "A_CHANGEANGLERELATIVE"}, + {{A_ChangeAngleAbsolute}, "A_CHANGEANGLEABSOLUTE"}, + {{A_PlaySound}, "A_PLAYSOUND"}, + {{A_FindTarget}, "A_FINDTARGET"}, + {{A_FindTracer}, "A_FINDTRACER"}, + {{A_SetTics}, "A_SETTICS"}, + {{A_SetRandomTics}, "A_SETRANDOMTICS"}, + {{A_ChangeColorRelative}, "A_CHANGECOLORRELATIVE"}, + {{A_ChangeColorAbsolute}, "A_CHANGECOLORABSOLUTE"}, + {{A_MoveRelative}, "A_MOVERELATIVE"}, + {{A_MoveAbsolute}, "A_MOVEABSOLUTE"}, + {{A_Thrust}, "A_THRUST"}, + {{A_ZThrust}, "A_ZTHRUST"}, + {{A_SetTargetsTarget}, "A_SETTARGETSTARGET"}, + {{A_SetObjectFlags}, "A_SETOBJECTFLAGS"}, + {{A_SetObjectFlags2}, "A_SETOBJECTFLAGS2"}, + {{A_RandomState}, "A_RANDOMSTATE"}, + {{A_RandomStateRange}, "A_RANDOMSTATERANGE"}, + {{A_DualAction}, "A_DUALACTION"}, + {{A_RemoteAction}, "A_REMOTEACTION"}, + {{A_ToggleFlameJet}, "A_TOGGLEFLAMEJET"}, + {{A_ItemPop}, "A_ITEMPOP"}, // SRB2kart + {{A_JawzChase}, "A_JAWZCHASE"}, // SRB2kart + {{A_JawzExplode}, "A_JAWZEXPLODE"}, // SRB2kart + {{A_SPBChase}, "A_SPBCHASE"}, // SRB2kart + {{A_MineExplode}, "A_MINEEXPLODE"}, // SRB2kart + {{A_BallhogExplode}, "A_BALLHOGEXPLODE"}, // SRB2kart + {{A_LightningFollowPlayer},"A_LIGHTNINGFOLLOWPLAYER"}, //SRB2kart + {{A_FZBoomFlash}, "A_FZBOOMFLASH"}, //SRB2kart + {{A_FZBoomSmoke}, "A_FZBOOMSMOKE"}, //SRB2kart + {{A_RandomShadowFrame}, "A_RANDOMSHADOWFRAME"}, //SRB2kart + {{A_RoamingShadowThinker}, "A_ROAMINGSHADOWTHINKER"}, //SRB2kart + {{A_MayonakaArrow}, "A_MAYONAKAARROW"}, //SRB2kart + {{A_ReaperThinker}, "A_REAPERTHINKER"}, //SRB2kart + {{A_MementosTPParticles}, "A_MEMENTOSTPPARTICLES"}, //SRB2kart + {{A_FlameParticle}, "A_FLAMEPARTICLE"}, // SRB2kart + {{A_OrbitNights}, "A_ORBITNIGHTS"}, + {{A_GhostMe}, "A_GHOSTME"}, + {{A_SetObjectState}, "A_SETOBJECTSTATE"}, + {{A_SetObjectTypeState}, "A_SETOBJECTTYPESTATE"}, + {{A_KnockBack}, "A_KNOCKBACK"}, + {{A_PushAway}, "A_PUSHAWAY"}, + {{A_RingDrain}, "A_RINGDRAIN"}, + {{A_SplitShot}, "A_SPLITSHOT"}, + {{A_MissileSplit}, "A_MISSILESPLIT"}, + {{A_MultiShot}, "A_MULTISHOT"}, + {{A_InstaLoop}, "A_INSTALOOP"}, + {{A_Custom3DRotate}, "A_CUSTOM3DROTATE"}, + {{A_SearchForPlayers}, "A_SEARCHFORPLAYERS"}, + {{A_CheckRandom}, "A_CHECKRANDOM"}, + {{A_CheckTargetRings}, "A_CHECKTARGETRINGS"}, + {{A_CheckRings}, "A_CHECKRINGS"}, + {{A_CheckTotalRings}, "A_CHECKTOTALRINGS"}, + {{A_CheckHealth}, "A_CHECKHEALTH"}, + {{A_CheckRange}, "A_CHECKRANGE"}, + {{A_CheckHeight}, "A_CHECKHEIGHT"}, + {{A_CheckTrueRange}, "A_CHECKTRUERANGE"}, + {{A_CheckThingCount}, "A_CHECKTHINGCOUNT"}, + {{A_CheckAmbush}, "A_CHECKAMBUSH"}, + {{A_CheckCustomValue}, "A_CHECKCUSTOMVALUE"}, + {{A_CheckCusValMemo}, "A_CHECKCUSVALMEMO"}, + {{A_SetCustomValue}, "A_SETCUSTOMVALUE"}, + {{A_UseCusValMemo}, "A_USECUSVALMEMO"}, + {{A_RelayCustomValue}, "A_RELAYCUSTOMVALUE"}, + {{A_CusValAction}, "A_CUSVALACTION"}, + {{A_ForceStop}, "A_FORCESTOP"}, + {{A_ForceWin}, "A_FORCEWIN"}, + {{A_SpikeRetract}, "A_SPIKERETRACT"}, + {{A_InfoState}, "A_INFOSTATE"}, + {{A_Repeat}, "A_REPEAT"}, + {{A_SetScale}, "A_SETSCALE"}, + {{A_RemoteDamage}, "A_REMOTEDAMAGE"}, + {{A_HomingChase}, "A_HOMINGCHASE"}, + {{A_TrapShot}, "A_TRAPSHOT"}, + {{A_VileTarget}, "A_VILETARGET"}, + {{A_VileAttack}, "A_VILEATTACK"}, + {{A_VileFire}, "A_VILEFIRE"}, + {{A_BrakChase}, "A_BRAKCHASE"}, + {{A_BrakFireShot}, "A_BRAKFIRESHOT"}, + {{A_BrakLobShot}, "A_BRAKLOBSHOT"}, + {{A_NapalmScatter}, "A_NAPALMSCATTER"}, + {{A_SpawnFreshCopy}, "A_SPAWNFRESHCOPY"}, - {NULL, "NONE"}, + {{NULL}, "NONE"}, // This NULL entry must be the last in the list - {NULL, NULL}, + {{NULL}, NULL}, }; static void readframe(MYFILE *f, INT32 num) @@ -1710,7 +1709,7 @@ static void readframe(MYFILE *f, INT32 num) for (z = 0; actionpointers[z].name; z++) { - if (actionpointers[z].action == states[num].action) + if (actionpointers[z].action.acv == states[num].action.acv) { break; } @@ -1719,17 +1718,17 @@ static void readframe(MYFILE *f, INT32 num) z = 0; found = LUA_SetLuaAction(&states[num], actiontocompare); if (!found) + while (actionpointers[z].name) { - while (actionpointers[z].name) + if (fastcmp(actiontocompare, actionpointers[z].name)) { - if (fastcmp(actiontocompare, actionpointers[z].name)) - { - states[num].action = actionpointers[z].action; - found = true; - break; - } - z++; + states[num].action = actionpointers[z].action; + states[num].action.acv = actionpointers[z].action.acv; // assign + states[num].action.acp1 = actionpointers[z].action.acp1; + found = true; + break; } + z++; } if (!found) @@ -8533,13 +8532,13 @@ static inline int lib_freeslot(lua_State *L) // Arguments: mobj_t actor, int var1, int var2 static inline int lib_action(lua_State *L) { - actionf_p1 *action = lua_touserdata(L,lua_upvalueindex(1)); + actionf_t *action = lua_touserdata(L,lua_upvalueindex(1)); mobj_t *actor = *((mobj_t **)luaL_checkudata(L,1,META_MOBJ)); var1 = (INT32)luaL_optinteger(L,2,0); var2 = (INT32)luaL_optinteger(L,3,0); if (!actor) return LUA_ErrInvalid(L, "mobj_t"); - (*action)(actor); + action->acp1(actor); return 0; } @@ -9353,15 +9352,13 @@ int LUA_SOCLib(lua_State *L) const char *LUA_GetActionName(void *action) { - actionf_p1 *act = (actionf_p1 *)action; + actionf_t *act = (actionf_t *)action; size_t z; - for (z = 0; actionpointers[z].name; z++) { - if (actionpointers[z].action == *act) + if (actionpointers[z].action.acv == act->acv) return actionpointers[z].name; } - return NULL; } @@ -9374,6 +9371,8 @@ void LUA_SetActionByName(void *state, const char *actiontocompare) if (fasticmp(actiontocompare, actionpointers[z].name)) { st->action = actionpointers[z].action; + st->action.acv = actionpointers[z].action.acv; // assign + st->action.acp1 = actionpointers[z].action.acp1; return; } } diff --git a/src/discord.c b/src/discord.c index 158c79f7f..cd7dafa8f 100644 --- a/src/discord.c +++ b/src/discord.c @@ -489,7 +489,7 @@ void DRPC_UpdatePresence(void) { #endif discordPresence.state = "Private"; -#ifdef MASTERSERVER +#ifdef MASTERSERVER } #endif diff --git a/src/doomtype.h b/src/doomtype.h index a7387b850..174bba5b1 100644 --- a/src/doomtype.h +++ b/src/doomtype.h @@ -17,8 +17,6 @@ #ifndef __DOOMTYPE__ #define __DOOMTYPE__ -#include "stdbool.h" - #if defined (_WIN32) //#define WIN32_LEAN_AND_MEAN #define RPC_NO_WINDOWS_H @@ -157,11 +155,23 @@ size_t strlcpy(char *dst, const char *src, size_t siz); #define STRBUFCPY(dst,src) strlcpy(dst, src, sizeof dst) /* Boolean type definition */ -#ifdef _WIN32 -#define boolean bool -#else -typedef bool boolean; -#endif + +// \note __BYTEBOOL__ used to be set above if "macintosh" was defined, +// if macintosh's version of boolean type isn't needed anymore, then isn't this macro pointless now? +#ifndef __BYTEBOOL__ + #define __BYTEBOOL__ + + //faB: clean that up !! + #if defined( _MSC_VER) && (_MSC_VER >= 1800) // MSVC 2013 and forward + #include "stdbool.h" + #elif defined (_WIN32) + #define false FALSE // use windows types + #define true TRUE + #define boolean BOOL + #else + typedef enum {false, true} boolean; + #endif +#endif // __BYTEBOOL__ /* 7.18.2.1 Limits of exact-width integer types */ #ifndef INT8_MIN diff --git a/src/g_game.c b/src/g_game.c index 9e991fff5..3d2f37fac 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -2629,7 +2629,7 @@ void G_ChangePlayerReferences(mobj_t *oldmo, mobj_t *newmo) // scan all thinkers for (th = thinkercap.next; th != &thinkercap; th = th->next) { - if (th->function != (actionf_p1)P_MobjThinker) + if (th->function.acp1 != (actionf_p1)P_MobjThinker) continue; mo2 = (mobj_t *)th; @@ -5213,7 +5213,7 @@ void G_ConsGhostTic(INT32 playernum) mobj = NULL; for (th = thinkercap.next; th != &thinkercap; th = th->next) { - if (th->function != (actionf_p1)P_MobjThinker) + if (th->function.acp1 != (actionf_p1)P_MobjThinker) continue; mobj = (mobj_t *)th; if (mobj->type == (mobjtype_t)type && mobj->x == x && mobj->y == y && mobj->z == z) @@ -6130,39 +6130,38 @@ void G_BeginRecording(void) CV_SaveNetVars(&demobuf.p, true); // Now store some info for each in-game player - for (p = 0; p < MAXPLAYERS; p++) - { - if (!playeringame[p]) - continue; + for (p = 0; p < MAXPLAYERS; p++) { + if (playeringame[p]) { + player = &players[p]; - player = &players[p]; + WRITEUINT8(demobuf.p, p | (player->spectator ? DEMO_SPECTATOR : 0)); - WRITEUINT8(demobuf.p, p | (player->spectator ? DEMO_SPECTATOR : 0)); + // Name + memset(name, 0, 16); + memcpy(name, player_names[p], 15); + M_Memcpy(demobuf.p,name,16); + demobuf.p += 16; - // Name - memset(name, 0, 16); - memcpy(name, player_names[p], 15); - M_Memcpy(demobuf.p,name,16); - demobuf.p += 16; + // Skin + memset(name, 0, 16); + strncpy(name, skins[player->skin].name, 16); + M_Memcpy(demobuf.p,name,16); + demobuf.p += 16; - // Skin - memset(name, 0, 16); - strncpy(name, skins[player->skin].name, 16); - M_Memcpy(demobuf.p,name,16); - demobuf.p += 16; + // Color + memset(name, 0, 16); + strncpy(name, KartColor_Names[player->skincolor], 16); + M_Memcpy(demobuf.p,name,16); + demobuf.p += 16; - // Color - memset(name, 0, 16); - strncpy(name, KartColor_Names[player->skincolor], 16); - M_Memcpy(demobuf.p,name,16); - demobuf.p += 16; + // Score, since Kart uses this to determine where you start on the map + WRITEUINT32(demobuf.p, player->score); - // Score, since Kart uses this to determine where you start on the map - WRITEUINT32(demobuf.p, player->score); + // Kart speed and weight + WRITEUINT8(demobuf.p, skins[player->skin].kartspeed); + WRITEUINT8(demobuf.p, skins[player->skin].kartweight); - // Kart speed and weight - WRITEUINT8(demobuf.p, skins[player->skin].kartspeed); - WRITEUINT8(demobuf.p, skins[player->skin].kartweight); + } } WRITEUINT8(demobuf.p, 0xFF); // Denote the end of the player listing @@ -7275,9 +7274,9 @@ void G_DoPlayDemo(char *defdemoname) //LUA_HookInt(gamemap, HOOK(MapChange)); consoleplayer = 0; - memset(playeringame, 0, sizeof(playeringame)); - memset(displayplayers, 0, sizeof(displayplayers)); - memset(camera, 0, sizeof(camera)); // reset freecam + memset(playeringame,0,sizeof(playeringame)); + memset(displayplayers,0,sizeof(displayplayers)); + memset(camera,0,sizeof(camera)); // reset freecam // Load players that were in-game when the map started p = READUINT8(demobuf.p); @@ -7853,7 +7852,7 @@ void G_DoPlayMetal(void) // find metal sonic for (th = thinkercap.next; th != &thinkercap; th = th->next) { - if (th->function != (actionf_p1)P_MobjThinker) + if (th->function.acp1 != (actionf_p1)P_MobjThinker) continue; mo = (mobj_t *)th; diff --git a/src/hardware/hw_cache.c b/src/hardware/hw_cache.c index 7254ba227..85e50465a 100644 --- a/src/hardware/hw_cache.c +++ b/src/hardware/hw_cache.c @@ -787,7 +787,7 @@ static void HWR_PrecacheLevelSprites(void) for (th = thinkercap.next; th != &thinkercap; th = th->next) { - if (th->function != (actionf_p1)P_MobjThinker) + if (th->function.acp1 != (actionf_p1)P_MobjThinker) continue; mo = (mobj_t *)th; diff --git a/src/info.c b/src/info.c index 5aec3fa27..034b073a3 100644 --- a/src/info.c +++ b/src/info.c @@ -78,2486 +78,2543 @@ state_t states[NUMSTATES] = // (or tr_trans10<