jprdonnelly/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2026-04-11 05:00:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace "short" with "int16_t" and fix missing headers

Browse Source
This commit is contained in:
GravisZro
2024-05-23 23:27:12 -04:00
parent aebe1bbbb6
commit 5e5e0c99c3
248 changed files with 5431 additions and 5423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
scripts/Inversion.cpp
View File

@@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void);
DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door);
DLLEXPORT void STDCALLPTR CreateInstance(int id);
DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr);
DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data);
DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data);
DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face);
DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list);
DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state);
@@ -83,112 +83,112 @@ class BaseScript {
public:
BaseScript();
~BaseScript();
virtual short CallEvent(int event, tOSIRISEventInfo *data);
virtual int16_t CallEvent(int event, tOSIRISEventInfo *data);
};
class LevelScript_0000 : public BaseScript {
public:
short CallEvent(int event, tOSIRISEventInfo *data);
int16_t CallEvent(int event, tOSIRISEventInfo *data);
};
class CustomObjectScript_0810 : public BaseScript {
public:
short CallEvent(int event, tOSIRISEventInfo *data);
int16_t CallEvent(int event, tOSIRISEventInfo *data);
};
class CustomObjectScript_0811 : public BaseScript {
public:
short CallEvent(int event, tOSIRISEventInfo *data);
int16_t CallEvent(int event, tOSIRISEventInfo *data);
};
class CustomObjectScript_0812 : public BaseScript {
public:
short CallEvent(int event, tOSIRISEventInfo *data);
int16_t CallEvent(int event, tOSIRISEventInfo *data);
};
class CustomObjectScript_0813 : public BaseScript {
public:
short CallEvent(int event, tOSIRISEventInfo *data);
int16_t CallEvent(int event, tOSIRISEventInfo *data);
};
class CustomObjectScript_0876 : public BaseScript {
public:
short CallEvent(int event, tOSIRISEventInfo *data);
int16_t CallEvent(int event, tOSIRISEventInfo *data);
};
class CustomObjectScript_0875 : public BaseScript {
public:
short CallEvent(int event, tOSIRISEventInfo *data);
int16_t CallEvent(int event, tOSIRISEventInfo *data);
};
class CustomObjectScript_0859 : public BaseScript {
public:
short CallEvent(int event, tOSIRISEventInfo *data);
int16_t CallEvent(int event, tOSIRISEventInfo *data);
};
class CustomObjectScript_085A : public BaseScript {
public:
short CallEvent(int event, tOSIRISEventInfo *data);
int16_t CallEvent(int event, tOSIRISEventInfo *data);
};
class TriggerScript_0009 : public BaseScript {
public:
short CallEvent(int event, tOSIRISEventInfo *data);
int16_t CallEvent(int event, tOSIRISEventInfo *data);
};
class TriggerScript_0008 : public BaseScript {
public:
short CallEvent(int event, tOSIRISEventInfo *data);
int16_t CallEvent(int event, tOSIRISEventInfo *data);
};
class TriggerScript_0007 : public BaseScript {
public:
short CallEvent(int event, tOSIRISEventInfo *data);
int16_t CallEvent(int event, tOSIRISEventInfo *data);
};
class TriggerScript_0006 : public BaseScript {
public:
short CallEvent(int event, tOSIRISEventInfo *data);
int16_t CallEvent(int event, tOSIRISEventInfo *data);
};
class TriggerScript_0003 : public BaseScript {
public:
short CallEvent(int event, tOSIRISEventInfo *data);
int16_t CallEvent(int event, tOSIRISEventInfo *data);
};
class TriggerScript_0002 : public BaseScript {
public:
short CallEvent(int event, tOSIRISEventInfo *data);
int16_t CallEvent(int event, tOSIRISEventInfo *data);
};
class TriggerScript_0001 : public BaseScript {
public:
short CallEvent(int event, tOSIRISEventInfo *data);
int16_t CallEvent(int event, tOSIRISEventInfo *data);
};
class TriggerScript_0000 : public BaseScript {
public:
short CallEvent(int event, tOSIRISEventInfo *data);
int16_t CallEvent(int event, tOSIRISEventInfo *data);
};
class TriggerScript_000B : public BaseScript {
public:
short CallEvent(int event, tOSIRISEventInfo *data);
int16_t CallEvent(int event, tOSIRISEventInfo *data);
};
class TriggerScript_000A : public BaseScript {
public:
short CallEvent(int event, tOSIRISEventInfo *data);
int16_t CallEvent(int event, tOSIRISEventInfo *data);
};
class TriggerScript_0005 : public BaseScript {
public:
short CallEvent(int event, tOSIRISEventInfo *data);
int16_t CallEvent(int event, tOSIRISEventInfo *data);
};
class TriggerScript_0004 : public BaseScript {
public:
short CallEvent(int event, tOSIRISEventInfo *data);
int16_t CallEvent(int event, tOSIRISEventInfo *data);
};
// ======================
@@ -868,7 +868,7 @@ void STDCALL DestroyInstance(int id, void *ptr) {
// ===================
// CallInstanceEvent()
// ===================
short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) {
int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) {
switch (id) {
case ID_LEVEL_0000:
case ID_CUSTOM_OBJECT_0810:
@@ -981,12 +981,12 @@ BaseScript::BaseScript() {}
BaseScript::~BaseScript() {}
short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) {
int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) {
mprintf(0, "BaseScript::CallEvent()\n");
return CONTINUE_CHAIN | CONTINUE_DEFAULT;
}
short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) {
int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) {
switch (event) {
case EVT_SAVESTATE: {
tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate;
@@ -1090,7 +1090,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) {
return CONTINUE_CHAIN | CONTINUE_DEFAULT;
}
short CustomObjectScript_0810::CallEvent(int event, tOSIRISEventInfo *data) {
int16_t CustomObjectScript_0810::CallEvent(int event, tOSIRISEventInfo *data) {
switch (event) {
case EVT_COLLIDE: {
tOSIRISEVTCOLLIDE *event_data = &data->evt_collide;
@@ -1141,7 +1141,7 @@ short CustomObjectScript_0810::CallEvent(int event, tOSIRISEventInfo *data) {
return CONTINUE_CHAIN | CONTINUE_DEFAULT;
}
short CustomObjectScript_0811::CallEvent(int event, tOSIRISEventInfo *data) {
int16_t CustomObjectScript_0811::CallEvent(int event, tOSIRISEventInfo *data) {
switch (event) {
case EVT_COLLIDE: {
tOSIRISEVTCOLLIDE *event_data = &data->evt_collide;
@@ -1192,7 +1192,7 @@ short CustomObjectScript_0811::CallEvent(int event, tOSIRISEventInfo *data) {
return CONTINUE_CHAIN | CONTINUE_DEFAULT;
}
short CustomObjectScript_0812::CallEvent(int event, tOSIRISEventInfo *data) {
int16_t CustomObjectScript_0812::CallEvent(int event, tOSIRISEventInfo *data) {
switch (event) {
case EVT_COLLIDE: {
tOSIRISEVTCOLLIDE *event_data = &data->evt_collide;
@@ -1243,7 +1243,7 @@ short CustomObjectScript_0812::CallEvent(int event, tOSIRISEventInfo *data) {
return CONTINUE_CHAIN | CONTINUE_DEFAULT;
}
short CustomObjectScript_0813::CallEvent(int event, tOSIRISEventInfo *data) {
int16_t CustomObjectScript_0813::CallEvent(int event, tOSIRISEventInfo *data) {
switch (event) {
case EVT_COLLIDE: {
tOSIRISEVTCOLLIDE *event_data = &data->evt_collide;
@@ -1294,7 +1294,7 @@ short CustomObjectScript_0813::CallEvent(int event, tOSIRISEventInfo *data) {
return CONTINUE_CHAIN | CONTINUE_DEFAULT;
}
short CustomObjectScript_0876::CallEvent(int event, tOSIRISEventInfo *data) {
int16_t CustomObjectScript_0876::CallEvent(int event, tOSIRISEventInfo *data) {
switch (event) {
case EVT_COLLIDE: {
tOSIRISEVTCOLLIDE *event_data = &data->evt_collide;
@@ -1345,7 +1345,7 @@ short CustomObjectScript_0876::CallEvent(int event, tOSIRISEventInfo *data) {
return CONTINUE_CHAIN | CONTINUE_DEFAULT;
}
short CustomObjectScript_0875::CallEvent(int event, tOSIRISEventInfo *data) {
int16_t CustomObjectScript_0875::CallEvent(int event, tOSIRISEventInfo *data) {
switch (event) {
case EVT_COLLIDE: {
tOSIRISEVTCOLLIDE *event_data = &data->evt_collide;
@@ -1396,7 +1396,7 @@ short CustomObjectScript_0875::CallEvent(int event, tOSIRISEventInfo *data) {
return CONTINUE_CHAIN | CONTINUE_DEFAULT;
}
short CustomObjectScript_0859::CallEvent(int event, tOSIRISEventInfo *data) {
int16_t CustomObjectScript_0859::CallEvent(int event, tOSIRISEventInfo *data) {
switch (event) {
case EVT_COLLIDE: {
tOSIRISEVTCOLLIDE *event_data = &data->evt_collide;
@@ -1447,7 +1447,7 @@ short CustomObjectScript_0859::CallEvent(int event, tOSIRISEventInfo *data) {
return CONTINUE_CHAIN | CONTINUE_DEFAULT;
}
short CustomObjectScript_085A::CallEvent(int event, tOSIRISEventInfo *data) {
int16_t CustomObjectScript_085A::CallEvent(int event, tOSIRISEventInfo *data) {
switch (event) {
case EVT_COLLIDE: {
tOSIRISEVTCOLLIDE *event_data = &data->evt_collide;
@@ -1498,7 +1498,7 @@ short CustomObjectScript_085A::CallEvent(int event, tOSIRISEventInfo *data) {
return CONTINUE_CHAIN | CONTINUE_DEFAULT;
}
short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) {
int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) {
switch (event) {
case EVT_COLLIDE: {
tOSIRISEVTCOLLIDE *event_data = &data->evt_collide;
@@ -1517,7 +1517,7 @@ short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) {
return CONTINUE_CHAIN | CONTINUE_DEFAULT;
}
short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) {
int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) {
switch (event) {
case EVT_COLLIDE: {
tOSIRISEVTCOLLIDE *event_data = &data->evt_collide;
@@ -1536,7 +1536,7 @@ short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) {
return CONTINUE_CHAIN | CONTINUE_DEFAULT;
}
short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) {
int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) {
switch (event) {
case EVT_COLLIDE: {
tOSIRISEVTCOLLIDE *event_data = &data->evt_collide;
@@ -1555,7 +1555,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) {
return CONTINUE_CHAIN | CONTINUE_DEFAULT;
}
short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) {
int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) {
switch (event) {
case EVT_COLLIDE: {
tOSIRISEVTCOLLIDE *event_data = &data->evt_collide;
@@ -1574,7 +1574,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) {
return CONTINUE_CHAIN | CONTINUE_DEFAULT;
}
short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) {
int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) {
switch (event) {
case EVT_COLLIDE: {
tOSIRISEVTCOLLIDE *event_data = &data->evt_collide;
@@ -1593,7 +1593,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) {
return CONTINUE_CHAIN | CONTINUE_DEFAULT;
}
short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) {
int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) {
switch (event) {
case EVT_COLLIDE: {
tOSIRISEVTCOLLIDE *event_data = &data->evt_collide;
@@ -1612,7 +1612,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) {
return CONTINUE_CHAIN | CONTINUE_DEFAULT;
}
short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) {
int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) {
switch (event) {
case EVT_COLLIDE: {
tOSIRISEVTCOLLIDE *event_data = &data->evt_collide;
@@ -1631,7 +1631,7 @@ short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) {
return CONTINUE_CHAIN | CONTINUE_DEFAULT;
}
short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) {
int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) {
switch (event) {
case EVT_COLLIDE: {
tOSIRISEVTCOLLIDE *event_data = &data->evt_collide;
@@ -1650,7 +1650,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) {
return CONTINUE_CHAIN | CONTINUE_DEFAULT;
}
short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) {
int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) {
switch (event) {
case EVT_COLLIDE: {
tOSIRISEVTCOLLIDE *event_data = &data->evt_collide;
@@ -1670,7 +1670,7 @@ short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) {
return CONTINUE_CHAIN | CONTINUE_DEFAULT;
}
short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) {
int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) {
switch (event) {
case EVT_COLLIDE: {
tOSIRISEVTCOLLIDE *event_data = &data->evt_collide;
@@ -1690,7 +1690,7 @@ short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) {
return CONTINUE_CHAIN | CONTINUE_DEFAULT;
}
short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) {
int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) {
switch (event) {
case EVT_COLLIDE: {
tOSIRISEVTCOLLIDE *event_data = &data->evt_collide;
@@ -1710,7 +1710,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) {
return CONTINUE_CHAIN | CONTINUE_DEFAULT;
}
short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) {
int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) {
switch (event) {
case EVT_COLLIDE: {
tOSIRISEVTCOLLIDE *event_data = &data->evt_collide;