aboutsummaryrefslogtreecommitdiff
path: root/sword2/events.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2003-10-05 15:28:15 +0000
committerTorbjörn Andersson2003-10-05 15:28:15 +0000
commit7174a32c8e877627c51da50b657083873aeef1e6 (patch)
tree09bc861d2ea952121279117bd1bb3b842d79ac1c /sword2/events.cpp
parent2e27e74fb42847c781e61f8acf29f6658a34f292 (diff)
downloadscummvm-rg350-7174a32c8e877627c51da50b657083873aeef1e6.tar.gz
scummvm-rg350-7174a32c8e877627c51da50b657083873aeef1e6.tar.bz2
scummvm-rg350-7174a32c8e877627c51da50b657083873aeef1e6.zip
Made a separate class for the cutscene functions, removed some unused code
and made some other minor cleanups. svn-id: r10614
Diffstat (limited to 'sword2/events.cpp')
-rw-r--r--sword2/events.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/sword2/events.cpp b/sword2/events.cpp
index d5766b9e1e..5a7ec32583 100644
--- a/sword2/events.cpp
+++ b/sword2/events.cpp
@@ -39,6 +39,7 @@ void Init_event_system(void) {
}
}
+#ifdef _SWORD2_DEBUG
uint32 CountEvents(void) {
uint32 count = 0;
@@ -49,6 +50,7 @@ uint32 CountEvents(void) {
return count;
}
+#endif
int32 FN_request_speech(int32 *params) {
// change current script - must be followed by a TERMINATE script
@@ -86,12 +88,6 @@ int32 FN_request_speech(int32 *params) {
void Set_player_action_event(uint32 id, uint32 interact_id) {
uint32 j = 0;
-// if (event_list[j].id != id && event_list[j].id)
-// // zip along until we find a free slot
-// while (event_list[j].id!=id || event_list[j].id) {
-// j++;
-// }
-
while (1) {
if (event_list[j].id == id)
break;
@@ -107,10 +103,10 @@ void Set_player_action_event(uint32 id, uint32 interact_id) {
// found that slot
- //id of person to stop
+ // id of person to stop
event_list[j].id = id;
- //full script id of action script number 2
+ // full script id of action script number 2
event_list[j].interact_id = (interact_id * 65536) + 2;
}