diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-12-21 19:43:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-21 16:43:06 -0800 |
| commit | b4f931f75f5d87fc7844e00eab7d7b99eceb3622 (patch) | |
| tree | 0b818358d479bf2d6ececafabe71c5c0918e19cc /src/d/actor/d_a_door_shutter.cpp | |
| parent | c69e31bd0fbfde798f0b86f5880f1b9d21696365 (diff) | |
Miscellaneous data fixes (#2983)
* Replace bss lbl_ with init$0000
* Rename l_HIOInit to hio_set
The name is excluded from TP's weird maps, but hio_set is the name they used in TWW's maps.
* Fix a couple more init$ names
* Fix nbomb missing some bss
* Fix camera localstatics having wrong name
* Rename l_initHIO to hio_set
* A couple manual fixes
* Rename hioInit to hio_set
* Couple more manual fixes
* Fix d_a_npc_cd2 data and function order
* More data fixes
* Fix inconsistent hex vs decimal
Diffstat (limited to 'src/d/actor/d_a_door_shutter.cpp')
| -rw-r--r-- | src/d/actor/d_a_door_shutter.cpp | 271 |
1 files changed, 134 insertions, 137 deletions
diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp index f689d3f209..633b2e2b43 100644 --- a/src/d/actor/d_a_door_shutter.cpp +++ b/src/d/actor/d_a_door_shutter.cpp @@ -50,9 +50,8 @@ char* daDoor20_c::getArcName() { } } -static char bmdName[32]; - char* daDoor20_c::getBmdName() { + static char bmdName[32]; switch(door_param2_c::getKind(this)) { case 0: case 1: @@ -1524,110 +1523,109 @@ void daDoor20_c::startDemoProc() { } } -static char* table[19] = { - "DEFAULT_STOP_OPEN", - "DEFAULT_STOP_OPEN", - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, -}; - -static char* tate_table[4] = { - "DEFAULT_SHUTTER_DOOR_10", - "DEFAULT_SHUTTER_DOOR_10", - "DEFAULT_SHUTTER_DOOR_F_STOP", - "DEFAULT_SHUTTER_DOOR_F_STOP", -}; - -static char* tate_w_table[4] = { - "WOLF_SHUTTER_DOOR_10", - "WOLF_SHUTTER_DOOR_10", - "WOLF_SHUTTER_DOOR_F_STOP", - "WOLF_SHUTTER_DOOR_F_STOP", -}; - -static char* yoko_table[4] = { - "DEFAULT_SHUTTER_DOOR_14", - "DEFAULT_SHUTTER_DOOR_14", - "DEFAULT_SHUTTER_DOOR_F_STOP_14", - "DEFAULT_SHUTTER_DOOR_F_STOP_14", -}; - -static char* yoko_w_table[4] = { - "WOLF_SHUTTER_DOOR_14", - "WOLF_SHUTTER_DOOR_14", - "WOLF_SHUTTER_DOOR_F_STOP_14", - "WOLF_SHUTTER_DOOR_F_STOP_14", -}; - -static char* lv8_table[4] = { - "DEFAULT_SHUTTER_DOOR_18", - "DEFAULT_SHUTTER_DOOR_18", - "DEFAULT_SHUTTER_DOOR_F_STOP_18", - "DEFAULT_SHUTTER_DOOR_F_STOP_18", -}; - -static char* lv8_w_table[4] = { - "WOLF_SHUTTER_DOOR_18", - "WOLF_SHUTTER_DOOR_18", - "WOLF_SHUTTER_DOOR_F_STOP_18", - "WOLF_SHUTTER_DOOR_F_STOP_18", -}; - -static char* knob_table[7] = { - "DEFAULT_KNOB_DOOR_F", - "DEFAULT_KNOB_DOOR_B", - "DEFAULT_KNOB_DOOR_F_STOP", - "DEFAULT_KNOB_DOOR_B_STOP", - "DEFAULT_KNOB_DOOR_NOTOPEN_F", - "DEFAULT_KNOB_DOOR_NOTOPEN_B", - "DEFAULT_KNOB_DOOR_TALK_NOTOPEN_F", -}; - -static char* lv7_table[4] = { - "DEFAULT_SHUTTER_DOOR_20", - "DEFAULT_SHUTTER_DOOR_20", - "DEFAULT_SHUTTER_DOOR_F_STOP_20", - "DEFAULT_SHUTTER_DOOR_F_STOP_20", -}; - -static char* lv7_w_table[4] = { - "WOLF_SHUTTER_DOOR_20", - "WOLF_SHUTTER_DOOR_20", - "WOLF_SHUTTER_DOOR_F_STOP_20", - "WOLF_SHUTTER_DOOR_F_STOP_20", -}; - -static char* lv9_table[4] = { - "DEFAULT_SHUTTER_DOOR_22", - "DEFAULT_SHUTTER_DOOR_22", - "DEFAULT_SHUTTER_DOOR_F_STOP_22", - "DEFAULT_SHUTTER_DOOR_F_STOP_22", -}; - -static char* lv9_w_table[4] = { - "WOLF_SHUTTER_DOOR_22", - "WOLF_SHUTTER_DOOR_22", - "WOLF_SHUTTER_DOOR_F_STOP_22", - "WOLF_SHUTTER_DOOR_F_STOP_22", -}; - - void daDoor20_c::makeEventId() { + static char* table[19] = { + "DEFAULT_STOP_OPEN", + "DEFAULT_STOP_OPEN", + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + }; + + static char* tate_table[4] = { + "DEFAULT_SHUTTER_DOOR_10", + "DEFAULT_SHUTTER_DOOR_10", + "DEFAULT_SHUTTER_DOOR_F_STOP", + "DEFAULT_SHUTTER_DOOR_F_STOP", + }; + + static char* tate_w_table[4] = { + "WOLF_SHUTTER_DOOR_10", + "WOLF_SHUTTER_DOOR_10", + "WOLF_SHUTTER_DOOR_F_STOP", + "WOLF_SHUTTER_DOOR_F_STOP", + }; + + static char* yoko_table[4] = { + "DEFAULT_SHUTTER_DOOR_14", + "DEFAULT_SHUTTER_DOOR_14", + "DEFAULT_SHUTTER_DOOR_F_STOP_14", + "DEFAULT_SHUTTER_DOOR_F_STOP_14", + }; + + static char* yoko_w_table[4] = { + "WOLF_SHUTTER_DOOR_14", + "WOLF_SHUTTER_DOOR_14", + "WOLF_SHUTTER_DOOR_F_STOP_14", + "WOLF_SHUTTER_DOOR_F_STOP_14", + }; + + static char* lv8_table[4] = { + "DEFAULT_SHUTTER_DOOR_18", + "DEFAULT_SHUTTER_DOOR_18", + "DEFAULT_SHUTTER_DOOR_F_STOP_18", + "DEFAULT_SHUTTER_DOOR_F_STOP_18", + }; + + static char* lv8_w_table[4] = { + "WOLF_SHUTTER_DOOR_18", + "WOLF_SHUTTER_DOOR_18", + "WOLF_SHUTTER_DOOR_F_STOP_18", + "WOLF_SHUTTER_DOOR_F_STOP_18", + }; + + static char* knob_table[7] = { + "DEFAULT_KNOB_DOOR_F", + "DEFAULT_KNOB_DOOR_B", + "DEFAULT_KNOB_DOOR_F_STOP", + "DEFAULT_KNOB_DOOR_B_STOP", + "DEFAULT_KNOB_DOOR_NOTOPEN_F", + "DEFAULT_KNOB_DOOR_NOTOPEN_B", + "DEFAULT_KNOB_DOOR_TALK_NOTOPEN_F", + }; + + static char* lv7_table[4] = { + "DEFAULT_SHUTTER_DOOR_20", + "DEFAULT_SHUTTER_DOOR_20", + "DEFAULT_SHUTTER_DOOR_F_STOP_20", + "DEFAULT_SHUTTER_DOOR_F_STOP_20", + }; + + static char* lv7_w_table[4] = { + "WOLF_SHUTTER_DOOR_20", + "WOLF_SHUTTER_DOOR_20", + "WOLF_SHUTTER_DOOR_F_STOP_20", + "WOLF_SHUTTER_DOOR_F_STOP_20", + }; + + static char* lv9_table[4] = { + "DEFAULT_SHUTTER_DOOR_22", + "DEFAULT_SHUTTER_DOOR_22", + "DEFAULT_SHUTTER_DOOR_F_STOP_22", + "DEFAULT_SHUTTER_DOOR_F_STOP_22", + }; + + static char* lv9_w_table[4] = { + "WOLF_SHUTTER_DOOR_22", + "WOLF_SHUTTER_DOOR_22", + "WOLF_SHUTTER_DOOR_F_STOP_22", + "WOLF_SHUTTER_DOOR_F_STOP_22", + }; + for (int i = 0; i < 19; i++) { field_0x692[i] = dComIfGp_getEventManager().getEventIdx(this, table[i], 0xff); field_0x6b8[i] = 0xff; @@ -1831,39 +1829,38 @@ void daDoor20_c::getRestartPos(cXyz* param_1) { param_1->z = current.pos.z - fVar1 * field_0x680.z; } -static char* action_table[29] = { - "WAIT", - "STOP_OPEN", - "STOP_CLOSE", - "OPEN", - "CLOSE", - "SMOKE", - "SMOKE_END", - "SETGOAL", - "UNLOCK", - "SETSTART", - "SETANGLE", - "ADJUSTMENT", - "OPEN_PUSH", - "OPEN_PULL", - "OPEN_PUSH2", - "OPEN_PULL2", - "TALK", - "SETSTART_PUSH", - "SETSTART_PULL", - "END_CHECK", - "DROP_BF", - "DROP_AF", - "DELETE_LOCK", - "OPEN_INIT", - "ADJUSTMENT2", - "NOT_OPEN", - "MESSAGE", - "LIGHT_ANM", - "LIGHT_ANM2", -}; - int daDoor20_c::getDemoAction() { + static char* action_table[29] = { + "WAIT", + "STOP_OPEN", + "STOP_CLOSE", + "OPEN", + "CLOSE", + "SMOKE", + "SMOKE_END", + "SETGOAL", + "UNLOCK", + "SETSTART", + "SETANGLE", + "ADJUSTMENT", + "OPEN_PUSH", + "OPEN_PULL", + "OPEN_PUSH2", + "OPEN_PULL2", + "TALK", + "SETSTART_PUSH", + "SETSTART_PULL", + "END_CHECK", + "DROP_BF", + "DROP_AF", + "DELETE_LOCK", + "OPEN_INIT", + "ADJUSTMENT2", + "NOT_OPEN", + "MESSAGE", + "LIGHT_ANM", + "LIGHT_ANM2", + }; return dComIfGp_evmng_getMyActIdx(field_0x6cc, action_table, 29, 0, 0); } |
