[Scummvm-git-logs] scummvm master -> e71ee44cb0c1134b8e3c9d818720bf2473e307c3
digitall
noreply at scummvm.org
Tue Dec 26 01:12:51 UTC 2023
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e71ee44cb0 M4: Further Removal of Uneeded Extern Keywords From Engine Headers
Commit: e71ee44cb0c1134b8e3c9d818720bf2473e307c3
https://github.com/scummvm/scummvm/commit/e71ee44cb0c1134b8e3c9d818720bf2473e307c3
Author: D G Turner (digitall at scummvm.org)
Date: 2023-12-26T01:12:17Z
Commit Message:
M4: Further Removal of Uneeded Extern Keywords From Engine Headers
Changed paths:
engines/m4/adv_db_r/db_catalog.h
engines/m4/adv_r/adv_background.h
engines/m4/adv_r/adv_been.h
engines/m4/adv_r/adv_chk.h
engines/m4/adv_r/adv_file.h
engines/m4/adv_r/adv_hotspot.h
engines/m4/adv_r/adv_interface.h
engines/m4/adv_r/adv_inv.h
engines/m4/adv_r/adv_player.h
engines/m4/adv_r/adv_rails.h
engines/m4/adv_r/adv_scale.h
engines/m4/adv_r/adv_trigger.h
engines/m4/adv_r/adv_walk.h
engines/m4/adv_r/chunk_ops.h
engines/m4/adv_r/conv.h
engines/m4/adv_r/conv_io.h
engines/m4/adv_r/db_env.h
engines/m4/adv_r/other.h
diff --git a/engines/m4/adv_db_r/db_catalog.h b/engines/m4/adv_db_r/db_catalog.h
index d9a8b21d3ed..3a67601c381 100644
--- a/engines/m4/adv_db_r/db_catalog.h
+++ b/engines/m4/adv_db_r/db_catalog.h
@@ -43,14 +43,14 @@ bool read_catalog();
/**
* Return the catalog data
*/
-extern char *db_get_catalog();
+char *db_get_catalog();
/**
* Given an asset name, name, return "path" from the database in result.
* if path starts or ends with a '\', the '\' characters at those places
* are deleted.
*/
-extern char *db_rmlst_get_asset_room_path(const char *s, char *result, int32 *sceneCode);
+char *db_rmlst_get_asset_room_path(const char *s, char *result, int32 *sceneCode);
} // End of namespace M4
diff --git a/engines/m4/adv_r/adv_background.h b/engines/m4/adv_r/adv_background.h
index 70c6aecba14..2d1dd01828d 100644
--- a/engines/m4/adv_r/adv_background.h
+++ b/engines/m4/adv_r/adv_background.h
@@ -27,10 +27,10 @@
namespace M4 {
-extern void adv_freeCodes();
-extern void adv_freeBackground();
-extern bool adv_restoreBackground();
-extern bool adv_restoreCodes();
+void adv_freeCodes();
+void adv_freeBackground();
+bool adv_restoreBackground();
+bool adv_restoreCodes();
} // End of namespace M4
diff --git a/engines/m4/adv_r/adv_been.h b/engines/m4/adv_r/adv_been.h
index 8fc7a3af10b..d97c33d62e8 100644
--- a/engines/m4/adv_r/adv_been.h
+++ b/engines/m4/adv_r/adv_been.h
@@ -41,40 +41,40 @@ struct Scene_list {
* Takes the number of scenes to allocate space for
* @returns True if successfully allocated
*/
-extern bool player_been_init(int16 num_scenes);
+bool player_been_init(int16 num_scenes);
/**
* Shuts down player_been system. Deallocates some memory
*/
-extern void player_been_shutdown();
+void player_been_shutdown();
/**
* Resets the player_been system
*/
-extern void player_reset_been(void);
+void player_reset_been(void);
/**
* Saves/loads player_been information
*/
-extern void player_been_sync(Common::Serializer &s);
+void player_been_sync(Common::Serializer &s);
/**
* Called whenever player enters a scene
* @param scene_num Takes the scene to be entered
* @returns True if the player has been there before, or false otherwise
*/
-extern bool player_enters_scene(int16 scene_num);
+bool player_enters_scene(int16 scene_num);
/**
* Called if the apps programmer wants the player to forget about being in
* a room
*/
-extern void player_forgets_scene(int16 scene_num);
+void player_forgets_scene(int16 scene_num);
/**
* Checks whether player has been in specified scene before
*/
-extern bool player_been_here(int16 scene_num);
+bool player_been_here(int16 scene_num);
} // End of namespace M4
diff --git a/engines/m4/adv_r/adv_chk.h b/engines/m4/adv_r/adv_chk.h
index 6df46eac1da..a648e165b9c 100644
--- a/engines/m4/adv_r/adv_chk.h
+++ b/engines/m4/adv_r/adv_chk.h
@@ -34,7 +34,7 @@ namespace M4 {
* @param rdef Output def to populate
* @returns Returns 0 if successful, or -1 for error
*/
-extern int db_def_chk_read(int16 room_code, SceneDef *rdef);
+int db_def_chk_read(int16 room_code, SceneDef *rdef);
} // End of namespace M4
diff --git a/engines/m4/adv_r/adv_file.h b/engines/m4/adv_r/adv_file.h
index 714fca9a417..925a8966210 100644
--- a/engines/m4/adv_r/adv_file.h
+++ b/engines/m4/adv_r/adv_file.h
@@ -32,29 +32,28 @@
namespace M4 {
-extern M4sprite *kernel_CreateThumbnail(int32 *spriteSize);
-extern bool kernel_CreateSSFromGrBuff(GrBuff *myBuff, RGB8 *myPalette, bool completePal, const char *ssName);
+M4sprite *kernel_CreateThumbnail(int32 *spriteSize);
+bool kernel_CreateSSFromGrBuff(GrBuff *myBuff, RGB8 *myPalette, bool completePal, const char *ssName);
-extern bool kernel_load_room(int minPalEntry, int maxPalEntry, SceneDef *rdef, GrBuff **scr_orig_data, GrBuff **scr_orig);
-extern void kernel_unload_room(SceneDef *rdef, GrBuff **code_data, GrBuff **loadBuffer);
+bool kernel_load_room(int minPalEntry, int maxPalEntry, SceneDef *rdef, GrBuff **scr_orig_data, GrBuff **scr_orig);
+void kernel_unload_room(SceneDef *rdef, GrBuff **code_data, GrBuff **loadBuffer);
-extern int kernel_save_game(int slot, const char *desc, int32 sizeofDesc, M4sprite *thumbNail, int32 sizeofThumbData);
-extern bool kernel_load_game(int slot);
-extern bool kernel_save_game_exists(int32 slot);
-extern int32 extract_room_num(const Common::String &name);
+int kernel_save_game(int slot, const char *desc, int32 sizeofDesc, M4sprite *thumbNail, int32 sizeofThumbData);
+bool kernel_load_game(int slot);
+bool kernel_save_game_exists(int32 slot);
+int32 extract_room_num(const Common::String &name);
-extern bool kernel_load_variant(char *variant);
-extern GrBuff *load_codes(SysFile *code_file);
-extern bool load_background(SysFile *pic_file, GrBuff **loadBuffer, RGB8 *palette);
+bool kernel_load_variant(char *variant);
+GrBuff *load_codes(SysFile *code_file);
+bool load_background(SysFile *pic_file, GrBuff **loadBuffer, RGB8 *palette);
-extern bool load_picture_and_codes(SysFile *pic_file, SysFile *code_file,
- GrBuff **loadBuf, GrBuff **code_data, uint8 minPalEntry, uint8 maxPalEntry);
+bool load_picture_and_codes(SysFile *pic_file, SysFile *code_file, GrBuff **loadBuf, GrBuff **code_data, uint8 minPalEntry, uint8 maxPalEntry);
-extern bool kernel_load_code_variant(SceneDef *rdef, char *variant, GrBuff **codeData);
+bool kernel_load_code_variant(SceneDef *rdef, char *variant, GrBuff **codeData);
-extern void kernel_current_background_name(char *result);
-extern void kernel_current_codes_name(char *result);
-extern void screen_capture(RGB8 *masterPalette);
+void kernel_current_background_name(char *result);
+void kernel_current_codes_name(char *result);
+void screen_capture(RGB8 *masterPalette);
} // End of namespace M4
diff --git a/engines/m4/adv_r/adv_hotspot.h b/engines/m4/adv_r/adv_hotspot.h
index 829d6648a7d..efd2dded7d4 100644
--- a/engines/m4/adv_r/adv_hotspot.h
+++ b/engines/m4/adv_r/adv_hotspot.h
@@ -45,7 +45,7 @@ struct HotSpotRec {
void clear();
};
-extern HotSpotRec *hotspot_add_dynamic(
+HotSpotRec *hotspot_add_dynamic(
char *verb, char *noun,
int32 x1, int32 y1, int32 x2, int32 y2,
int32 cursor,
@@ -57,53 +57,53 @@ extern HotSpotRec *hotspot_add_dynamic(
* else to default values.
* @returns The new hotspot
*/
-extern HotSpotRec *hotspot_new(int x1, int y1, int x2, int y2);
+HotSpotRec *hotspot_new(int x1, int y1, int x2, int y2);
/**
* Given a list and a hotspot to insert in that list, inserts the spot ordered by size,
* unless new_head is true, in which case the hotspot is the head regardless of size.
* @returns The new head of the list.
*/
-extern HotSpotRec *hotspot_add(HotSpotRec *head, HotSpotRec *h, bool new_head);
-extern HotSpotRec *hotspot_duplicate(HotSpotRec *dupMe);
+HotSpotRec *hotspot_add(HotSpotRec *head, HotSpotRec *h, bool new_head);
+HotSpotRec *hotspot_duplicate(HotSpotRec *dupMe);
/**
* Takes the head of a list of hot spots, and a pointer to a spot to delete.
* @returns The new head of the list.
*/
-extern HotSpotRec *hotspot_delete_record(HotSpotRec *head, HotSpotRec *h);
+HotSpotRec *hotspot_delete_record(HotSpotRec *head, HotSpotRec *h);
/**
* Takes the head of a list of hot spots, and a pointer to a spot to unlink.
* @returns The new head of the list.
*/
-extern HotSpotRec *hotspot_unlink(HotSpotRec *head, HotSpotRec *h);
-extern void hotspot_delete_all(HotSpotRec *head);
+HotSpotRec *hotspot_unlink(HotSpotRec *head, HotSpotRec *h);
+void hotspot_delete_all(HotSpotRec *head);
-extern void hotspot_set_active(HotSpotRec *head, const char *name, bool active_or_not);
-extern void hotspot_set_active(const char *name, bool active_or_not);
-extern void hotspot_set_active_xy(HotSpotRec *head, const char *name, int32 x, int32 y, bool active_or_not);
-extern void hotspot_set_active_xy(const char *name, int32 x, int32 y, bool active_or_not);
+void hotspot_set_active(HotSpotRec *head, const char *name, bool active_or_not);
+void hotspot_set_active(const char *name, bool active_or_not);
+void hotspot_set_active_xy(HotSpotRec *head, const char *name, int32 x, int32 y, bool active_or_not);
+void hotspot_set_active_xy(const char *name, int32 x, int32 y, bool active_or_not);
#define kernel_flip_hotspot(aa,bb) (hotspot_set_active(currentSceneDef.hotspots,aa,bb))
#define kernel_flip_hotspot_xy(aa,bb,xx,yy) (hotspot_set_active_xy(currentSceneDef.hotspots,aa,xx,yy,bb))
#define kernel_flip_hotspot_loc(aa,bb,xx,yy) (hotspot_set_active_xy(currentSceneDef.hotspots,aa,xx,yy,bb))
-extern void hotspot_new_sprite(HotSpotRec *h, const char *verb);
-extern void hotspot_newVerb(HotSpotRec *h, const char *verb);
-extern void hotspot_newVocab(HotSpotRec *h, const char *vocab);
-extern void hotspot_newPrep(HotSpotRec *h, const char *prep);
+void hotspot_new_sprite(HotSpotRec *h, const char *verb);
+void hotspot_newVerb(HotSpotRec *h, const char *verb);
+void hotspot_newVocab(HotSpotRec *h, const char *vocab);
+void hotspot_newPrep(HotSpotRec *h, const char *prep);
/**
* Given a list of spots to check, and an x,y coordinate pair,
* @returns A pointer to the hotspot we're inside, or nullptr if there's nothing.
*/
-extern HotSpotRec *hotspot_which(HotSpotRec *head, int x, int y);
-extern HotSpotRec *hotspot_which(int x, int y);
-extern void kill_hotspot_node(HotSpotRec *h);
+HotSpotRec *hotspot_which(HotSpotRec *head, int x, int y);
+HotSpotRec *hotspot_which(int x, int y);
+void kill_hotspot_node(HotSpotRec *h);
-extern void hotspot_restore_all();
-extern void hotspot_hide_all();
-extern void hotspot_unhide_and_dump();
+void hotspot_restore_all();
+void hotspot_hide_all();
+void hotspot_unhide_and_dump();
} // End of namespace M4
diff --git a/engines/m4/adv_r/adv_interface.h b/engines/m4/adv_r/adv_interface.h
index 3e792b91b5b..1d4615a015e 100644
--- a/engines/m4/adv_r/adv_interface.h
+++ b/engines/m4/adv_r/adv_interface.h
@@ -71,14 +71,14 @@ public:
void showWaitCursor();
};
-extern void interface_hide();
-extern void interface_show();
+void interface_hide();
+void interface_show();
-extern void track_hotspots_refresh();
-extern bool intr_EventHandler(void *bufferPtr, int32 eventType, int32 event, int32 x, int32 y, bool *z);
+void track_hotspots_refresh();
+bool intr_EventHandler(void *bufferPtr, int32 eventType, int32 event, int32 x, int32 y, bool *z);
-extern void intr_cancel_sentence();
-extern void intr_freshen_sentence();
+void intr_cancel_sentence();
+void intr_freshen_sentence();
} // End of namespace M4
diff --git a/engines/m4/adv_r/adv_inv.h b/engines/m4/adv_r/adv_inv.h
index 5d8d43cde2c..246b8a0b63e 100644
--- a/engines/m4/adv_r/adv_inv.h
+++ b/engines/m4/adv_r/adv_inv.h
@@ -52,7 +52,7 @@ struct InventoryBase {
/**
* Init the system, preferably in game_systems_initialize
*/
-extern bool inv_init(int32 num_objects);
+bool inv_init(int32 num_objects);
/**
* Register things during init of the game
@@ -63,21 +63,20 @@ extern bool inv_init(int32 num_objects);
* @param cel Index into the inventory sprite series for use when displaying inventory
* @param cursor Cel index into the cursor sprite series when the player is "holding" a thing
*/
-extern bool inv_register_thing(const Common::String &itemName, const Common::String &itemVerbs, int32 scene, int32 cel, int32 cursor);
-
-extern int32 inv_where_is(const Common::String &itemName);
-extern bool inv_player_has(const Common::String &itemName);
-extern bool inv_put_thing_in(const Common::String &itemName, int32 scene);
-extern int32 inv_get_cursor(const Common::String &itemName);
-extern int32 inv_get_cel(const Common::String &itemName);
-extern const char *inv_get_verbs(const Common::String &itemName);
-extern void inv_give_to_player(const Common::String &itemName);
-extern void inv_move_object(const Common::String &itemName, int32 scene);
-extern bool inv_object_is_here(const Common::String &itemName);
-extern bool inv_object_in_scene(const Common::String &itemName, int32 scene);
-
-
-extern void inv_sync_game(Common::Serializer &s);
+bool inv_register_thing(const Common::String &itemName, const Common::String &itemVerbs, int32 scene, int32 cel, int32 cursor);
+
+int32 inv_where_is(const Common::String &itemName);
+bool inv_player_has(const Common::String &itemName);
+bool inv_put_thing_in(const Common::String &itemName, int32 scene);
+int32 inv_get_cursor(const Common::String &itemName);
+int32 inv_get_cel(const Common::String &itemName);
+const char *inv_get_verbs(const Common::String &itemName);
+void inv_give_to_player(const Common::String &itemName);
+void inv_move_object(const Common::String &itemName, int32 scene);
+bool inv_object_is_here(const Common::String &itemName);
+bool inv_object_in_scene(const Common::String &itemName, int32 scene);
+
+void inv_sync_game(Common::Serializer &s);
} // End of namespace M4
diff --git a/engines/m4/adv_r/adv_player.h b/engines/m4/adv_r/adv_player.h
index 021a2a8f649..b82fb814207 100644
--- a/engines/m4/adv_r/adv_player.h
+++ b/engines/m4/adv_r/adv_player.h
@@ -97,30 +97,30 @@ struct PlayerInfo {
void syncGame(Common::Serializer &s);
};
-extern bool player_said(const char *w0, const char *w1 = nullptr, const char *w2 = nullptr);
-extern bool player_said_any(const char *w0, const char *w1 = nullptr, const char *w2 = nullptr,
+bool player_said(const char *w0, const char *w1 = nullptr, const char *w2 = nullptr);
+bool player_said_any(const char *w0, const char *w1 = nullptr, const char *w2 = nullptr,
const char *w3 = nullptr, const char *w4 = nullptr, const char *w5 = nullptr, const char *w6 = nullptr,
const char *w7 = nullptr, const char *w8 = nullptr, const char *w9 = nullptr);
-extern void player_inform_walker_new_scale(int32 frontY, int32 backY, int32 frontS, int32 backS);
+void player_inform_walker_new_scale(int32 frontY, int32 backY, int32 frontS, int32 backS);
-extern bool player_load_series(const char *walkerName, const char *shadowName, bool load_palette);
-extern void player_first_walk(int32 x1, int32 y1, int32 f1, int32 x2, int32 y2, int32 f2, bool enable_commands_at_destination);
-extern void player_set_commands_allowed(bool t_or_f);
-extern void player_set_defaults();
-extern void player_noun_becomes_verb(int32 spriteNum);
+bool player_load_series(const char *walkerName, const char *shadowName, bool load_palette);
+void player_first_walk(int32 x1, int32 y1, int32 f1, int32 x2, int32 y2, int32 f2, bool enable_commands_at_destination);
+void player_set_commands_allowed(bool t_or_f);
+void player_set_defaults();
+void player_noun_becomes_verb(int32 spriteNum);
-extern void player_hotspot_walk_override(int32 x, int32 y, int32 facing = -1, int32 trigger = -1);
-extern void player_hotspot_walk_override_just_face(int32 facing, int32 trigger = -1);
+void player_hotspot_walk_override(int32 x, int32 y, int32 facing = -1, int32 trigger = -1);
+void player_hotspot_walk_override_just_face(int32 facing, int32 trigger = -1);
-extern bool player_commands_allowed();
-extern PlayerInfo *player_update_info(machine *myWalker, PlayerInfo *player_info);
-extern PlayerInfo *player_update_info();
-extern void adv_kill_digi_between_rooms(bool true_or_false);
+bool player_commands_allowed();
+PlayerInfo *player_update_info(machine *myWalker, PlayerInfo *player_info);
+PlayerInfo *player_update_info();
+void adv_kill_digi_between_rooms(bool true_or_false);
-extern void player_set_facing_hotspot(int trigger = -1);
-extern void player_set_facing_at(int x, int y, int trigger = -1);
-extern int calc_facing(int x, int y);
+void player_set_facing_hotspot(int trigger = -1);
+void player_set_facing_at(int x, int y, int trigger = -1);
+int calc_facing(int x, int y);
} // End of namespace M4
diff --git a/engines/m4/adv_r/adv_rails.h b/engines/m4/adv_r/adv_rails.h
index 3361ce98b39..c252e716e2b 100644
--- a/engines/m4/adv_r/adv_rails.h
+++ b/engines/m4/adv_r/adv_rails.h
@@ -39,31 +39,31 @@ struct Rails_Globals {
int32 memtypePATHN = 0;
};
-extern bool InitRails();
-extern void rail_system_shutdown();
-extern void ClearRails();
-extern noWalkRect *intr_add_no_walk_rect(int32 x1, int32 y1, int32 x2, int32 y2, int32 altX, int32 altY, Buffer *walkCodes);
-extern noWalkRect *intr_add_no_walk_rect(int32 x1, int32 y1, int32 x2, int32 y2, int32 altX, int32 altY);
-extern void intr_move_no_walk_rect(noWalkRect *myRect, int32 new_x1, int32 new_y1,
+bool InitRails();
+void rail_system_shutdown();
+void ClearRails();
+noWalkRect *intr_add_no_walk_rect(int32 x1, int32 y1, int32 x2, int32 y2, int32 altX, int32 altY, Buffer *walkCodes);
+noWalkRect *intr_add_no_walk_rect(int32 x1, int32 y1, int32 x2, int32 y2, int32 altX, int32 altY);
+void intr_move_no_walk_rect(noWalkRect *myRect, int32 new_x1, int32 new_y1,
int32 new_x2, int32 new_y2, int32 new_altX, int32 new_altY, Buffer *walkCodes);
-extern void intr_remove_no_walk_rect(noWalkRect *myRect, Buffer *walkCodes);
-extern void intr_remove_no_walk_rect(noWalkRect *myRect);
-extern void CreateEdge(int32 node1, int32 node2, Buffer *walkCodes);
-extern void RestoreNodeEdges(int32 nodeID, Buffer *walkCodes);
-extern void RestoreEdgeList(Buffer *walkCodes);
-extern int32 AddRailNode(int32 x, int32 y, Buffer *walkCodes, bool restoreEdges);
-extern void MoveRailNode(int32 nodeID, int32 x, int32 y, Buffer *walkCodes, bool restoreEdges);
-extern bool RemoveRailNode(int32 nodeID, Buffer *walkCodes, bool restoreEdges);
-extern bool RailNodeExists(int32 nodeID, int32 *nodeX, int32 *nodeY);
-extern int16 GetEdgeLength(int32 node1, int32 node2);
-extern bool GetShortestPath(int32 origID, int32 destID, railNode **shortPath);
-extern railNode *CreateCustomPath(int32 coord, ...);
-extern void DisposePath(railNode *pathStart);
-extern bool intr_LineCrossesRect(int32 line_x1, int32 line_y1, int32 line_x2, int32 line_y2,
+void intr_remove_no_walk_rect(noWalkRect *myRect, Buffer *walkCodes);
+void intr_remove_no_walk_rect(noWalkRect *myRect);
+void CreateEdge(int32 node1, int32 node2, Buffer *walkCodes);
+void RestoreNodeEdges(int32 nodeID, Buffer *walkCodes);
+void RestoreEdgeList(Buffer *walkCodes);
+int32 AddRailNode(int32 x, int32 y, Buffer *walkCodes, bool restoreEdges);
+void MoveRailNode(int32 nodeID, int32 x, int32 y, Buffer *walkCodes, bool restoreEdges);
+bool RemoveRailNode(int32 nodeID, Buffer *walkCodes, bool restoreEdges);
+bool RailNodeExists(int32 nodeID, int32 *nodeX, int32 *nodeY);
+int16 GetEdgeLength(int32 node1, int32 node2);
+bool GetShortestPath(int32 origID, int32 destID, railNode **shortPath);
+railNode *CreateCustomPath(int32 coord, ...);
+void DisposePath(railNode *pathStart);
+bool intr_LineCrossesRect(int32 line_x1, int32 line_y1, int32 line_x2, int32 line_y2,
int32 rect_x1, int32 rect_y1, int32 rect_x2, int32 rect_y2);
-extern bool intr_LinesCross(int32 line1_x1, int32 line1_y1, int32 line1_x2, int32 line1_y2,
+bool intr_LinesCross(int32 line1_x1, int32 line1_y1, int32 line1_x2, int32 line1_y2,
int32 line2_x1, int32 line2_y1, int32 line2_x2, int32 line2_y2);
-extern bool intr_PathCrossesLine(int32 startX, int32 startY, railNode *pathStart,
+bool intr_PathCrossesLine(int32 startX, int32 startY, railNode *pathStart,
int32 line_x1, int32 line_y1, int32 line_x2, int32 line_y2);
} // End of namespace M4
diff --git a/engines/m4/adv_r/adv_scale.h b/engines/m4/adv_r/adv_scale.h
index 21e7fc3ffa6..2e286404719 100644
--- a/engines/m4/adv_r/adv_scale.h
+++ b/engines/m4/adv_r/adv_scale.h
@@ -38,9 +38,9 @@ struct ADVScale_Globals {
int _myfs = -1;
};
-extern void scale_editor_draw();
-extern void scale_editor_cancel();
-extern void scale_editor_toggle();
+void scale_editor_draw();
+void scale_editor_cancel();
+void scale_editor_toggle();
} // End of namespace M4
diff --git a/engines/m4/adv_r/adv_trigger.h b/engines/m4/adv_r/adv_trigger.h
index 84093e46277..8c4e62c36f1 100644
--- a/engines/m4/adv_r/adv_trigger.h
+++ b/engines/m4/adv_r/adv_trigger.h
@@ -50,8 +50,8 @@ struct Triggers {
* | +--- room_id (0 - 4096) (0 - 0xfff)
* +--- trigger_mode (0-16)
*/
-extern int32 kernel_trigger_create(int32 trigger_num);
-extern int32 kernel_trigger_create_mode(int32 trigger_num, int32 desired_mode);
+int32 kernel_trigger_create(int32 trigger_num);
+int32 kernel_trigger_create_mode(int32 trigger_num, int32 desired_mode);
/**
* Dispatches a trigger.
@@ -59,14 +59,14 @@ extern int32 kernel_trigger_create_mode(int32 trigger_num, int32 desired_mode);
* a different room that current room_id, returns false. If no trigger_mode was
* attached to the trigger, returns false
*/
-extern bool kernel_trigger_dispatchx(int32 trigger_num);
-extern bool kernel_trigger_dispatch_now(int32 trigger_num);
-extern void kernel_timing_trigger(int32 ticks, int16 trigger, const char *name = nullptr);
-extern void kernel_timing_trigger_daemon(int32 ticks, int16 trigger);
+bool kernel_trigger_dispatchx(int32 trigger_num);
+bool kernel_trigger_dispatch_now(int32 trigger_num);
+void kernel_timing_trigger(int32 ticks, int16 trigger, const char *name = nullptr);
+void kernel_timing_trigger_daemon(int32 ticks, int16 trigger);
-extern void cisco_dispatch_triggers();
-extern void cisco_clear_triggers();
-extern void kernel_service_timing_trigger_q();
+void cisco_dispatch_triggers();
+void cisco_clear_triggers();
+void kernel_service_timing_trigger_q();
} // End of namespace M4
diff --git a/engines/m4/adv_r/adv_walk.h b/engines/m4/adv_r/adv_walk.h
index e37d45d137f..69cb5960624 100644
--- a/engines/m4/adv_r/adv_walk.h
+++ b/engines/m4/adv_r/adv_walk.h
@@ -37,38 +37,37 @@ public:
virtual machine *walk_initialize_walker() = 0;
};
-extern void set_walker_scaling(SceneDef *rdef);
+void set_walker_scaling(SceneDef *rdef);
/**
* Called every time s/he hits a node
*/
-extern bool walker_has_walk_finished(machine *sender);
-extern void ws_demand_location(machine *myWalker, int32 x, int32 y, int facing = -1);
-extern void ws_demand_facing(machine *myWalker, int32 newFacing);
-extern void ws_turn_to_face(machine *myWalker, int32 facing, int32 trigger = -1);
-extern void ws_nosepick(machine *myWalker, int32 seriesHash);
-extern void ws_hide_walker(machine *myWalker);
-extern void ws_unhide_walker(machine *myWalker);
-extern void ws_walk(machine *myWalker, int32 x, int32 y, GrBuff **, int16 trigger, int32 finalFacing, bool complete_walk = true);
-
-extern void ws_demand_location(int32 x, int32 y, int facing = -1);
-extern void ws_demand_facing(int32 newFacing);
-extern void ws_turn_to_face(int32 facing, int32 trigger = -1);
-extern void ws_nosepick(int32 seriesHash);
-extern void ws_hide_walker();
-extern void ws_unhide_walker();
-extern void ws_walk(int32 x, int32 y, GrBuff **buffer, int16 trigger, int32 finalFacing = -1, bool complete_walk = true);
-
-extern void ws_get_walker_info(machine *myWalker, int32 *x, int32 *y, int32 *s, int32 *layer, int32 *facing);
-
-
-extern bool ws_walk_init_system();
-
-extern bool ws_walk_load_series(const int16 *dir_array, const char *name_array[], bool shadow_flag, bool load_palette);
-extern bool ws_walk_load_walker_series(const int16 *dir_array, const char *name_array[], bool load_palette);
-extern bool ws_walk_load_shadow_series(const int16 *dir_array, const char *name_array[]);
-
-extern void ws_walk_dump_series(int16 num_directions, int16 start_hash);
+bool walker_has_walk_finished(machine *sender);
+void ws_demand_location(machine *myWalker, int32 x, int32 y, int facing = -1);
+void ws_demand_facing(machine *myWalker, int32 newFacing);
+void ws_turn_to_face(machine *myWalker, int32 facing, int32 trigger = -1);
+void ws_nosepick(machine *myWalker, int32 seriesHash);
+void ws_hide_walker(machine *myWalker);
+void ws_unhide_walker(machine *myWalker);
+void ws_walk(machine *myWalker, int32 x, int32 y, GrBuff **, int16 trigger, int32 finalFacing, bool complete_walk = true);
+
+void ws_demand_location(int32 x, int32 y, int facing = -1);
+void ws_demand_facing(int32 newFacing);
+void ws_turn_to_face(int32 facing, int32 trigger = -1);
+void ws_nosepick(int32 seriesHash);
+void ws_hide_walker();
+void ws_unhide_walker();
+void ws_walk(int32 x, int32 y, GrBuff **buffer, int16 trigger, int32 finalFacing = -1, bool complete_walk = true);
+
+void ws_get_walker_info(machine *myWalker, int32 *x, int32 *y, int32 *s, int32 *layer, int32 *facing);
+
+bool ws_walk_init_system();
+
+bool ws_walk_load_series(const int16 *dir_array, const char *name_array[], bool shadow_flag, bool load_palette);
+bool ws_walk_load_walker_series(const int16 *dir_array, const char *name_array[], bool load_palette);
+bool ws_walk_load_shadow_series(const int16 *dir_array, const char *name_array[]);
+
+void ws_walk_dump_series(int16 num_directions, int16 start_hash);
#define ws_walk_dump_walker_series(xx, yy) (ws_walk_dump_series (xx, yy))
#define ws_walk_dump_shadow_series(xx, yy) (ws_walk_dump_series (xx, yy))
@@ -84,7 +83,7 @@ extern void ws_walk_dump_series(int16 num_directions, int16 start_hash);
// New walking stuff
-extern void ws_custom_walk(machine *myWalker, int32 finalFacing, int32 trigger, bool complete_walk = true);
+void ws_custom_walk(machine *myWalker, int32 finalFacing, int32 trigger, bool complete_walk = true);
#define adv_walker_custom_walk(ww, ff, tt) (ws_custom_walk(ww, ff, tt, true))
#define adv_walker_custom_walk_no_finish(ww, ff, tt) (ws_custom_walk(ww, ff, tt, FALSE))
#define adv_walker_walk(ww, xx, yy, ff, tt) (ws_walk(ww, xx, yy, nullptr, tt, ff, true))
@@ -94,9 +93,9 @@ extern void ws_custom_walk(machine *myWalker, int32 finalFacing, int32 trigger,
#define adv_walker_move(ww, xx, yy) (ws_demand_location(ww, xx, yy))
#define adv_walker_hide(ww) (ws_hide_walker(ww))
#define adv_walker_unhide(ww) (ws_unhide_walker(ww))
-extern bool adv_walker_path_exists(machine *myWalker, int32 x, int32 y);
+bool adv_walker_path_exists(machine *myWalker, int32 x, int32 y);
-extern void adv_hyperwalk_to_final_destination(void *, void *);
+void adv_hyperwalk_to_final_destination(void *, void *);
} // End of namespace M4
diff --git a/engines/m4/adv_r/chunk_ops.h b/engines/m4/adv_r/chunk_ops.h
index 5baa8877b63..f5e36c047a2 100644
--- a/engines/m4/adv_r/chunk_ops.h
+++ b/engines/m4/adv_r/chunk_ops.h
@@ -63,31 +63,31 @@ namespace M4 {
#define DOT 446
#define CNE 448
-extern conv_chunk *get_conv(Conv *c, int32 cSize);
-extern entry_chunk *get_entry(Conv *c, int32 cSize);
-extern char *conv_ops_get_entry(int32 i, int32 *next, int32 *tag, Conv *c);
-extern void conv_ops_unknown_chunk(int32 tag, const char *s);
-extern decl_chunk *get_decl(Conv *c, int32 cSize);
-extern char *get_string(Conv *c, int32 cSize);
-extern text_chunk *get_text(Conv *c, int32 cSize);
-extern int32 conv_ops_text_strlen(char *s);
-extern c_assign_chunk *get_c_asgn(Conv *c, int32 cSize);
-extern int conv_ops_cond_successful(int32 l_op, int32 op, int32 r_op);
-extern int32 conv_ops_process_asgn(int32 val, int32 oprtr, int32 opnd);
-extern assign_chunk *get_asgn(Conv *c, int32 cSize);
-extern misc_chunk *get_misc(Conv *c, int32 cSize);
-extern entry_chunk *get_hash_entry(Conv *c, int32 cSize);
-extern c_misc_chunk *get_c_misc(Conv *c, int32 cSize);
-extern c_goto_chunk *get_c_goto(Conv *c, int32 cSize);
-extern goto_chunk *get_goto(Conv *c, int32 cSize);
-extern reply_chunk *get_reply(Conv *c, int32 cSize);
-extern lnode_chunk *get_lnode(Conv *c, int32 cSize);
-extern node_chunk *get_node(Conv *c, int32 cSize);
-extern fall_chunk *get_fall(Conv *c, int32 cSize);
-extern int32 get_long(Conv *c, int32 cSize);
-extern c_reply_chunk *get_c_reply(Conv *c, int32 cSize);
-extern w_reply_chunk *get_w_reply(Conv *c, int32 cSize);
-extern w_entry_chunk *get_w_entry(Conv *c, int32 cSize);
+conv_chunk *get_conv(Conv *c, int32 cSize);
+entry_chunk *get_entry(Conv *c, int32 cSize);
+char *conv_ops_get_entry(int32 i, int32 *next, int32 *tag, Conv *c);
+void conv_ops_unknown_chunk(int32 tag, const char *s);
+decl_chunk *get_decl(Conv *c, int32 cSize);
+char *get_string(Conv *c, int32 cSize);
+text_chunk *get_text(Conv *c, int32 cSize);
+int32 conv_ops_text_strlen(char *s);
+c_assign_chunk *get_c_asgn(Conv *c, int32 cSize);
+int conv_ops_cond_successful(int32 l_op, int32 op, int32 r_op);
+int32 conv_ops_process_asgn(int32 val, int32 oprtr, int32 opnd);
+assign_chunk *get_asgn(Conv *c, int32 cSize);
+misc_chunk *get_misc(Conv *c, int32 cSize);
+entry_chunk *get_hash_entry(Conv *c, int32 cSize);
+c_misc_chunk *get_c_misc(Conv *c, int32 cSize);
+c_goto_chunk *get_c_goto(Conv *c, int32 cSize);
+goto_chunk *get_goto(Conv *c, int32 cSize);
+reply_chunk *get_reply(Conv *c, int32 cSize);
+lnode_chunk *get_lnode(Conv *c, int32 cSize);
+node_chunk *get_node(Conv *c, int32 cSize);
+fall_chunk *get_fall(Conv *c, int32 cSize);
+int32 get_long(Conv *c, int32 cSize);
+c_reply_chunk *get_c_reply(Conv *c, int32 cSize);
+w_reply_chunk *get_w_reply(Conv *c, int32 cSize);
+w_entry_chunk *get_w_entry(Conv *c, int32 cSize);
} // End of namespace M4
diff --git a/engines/m4/adv_r/conv.h b/engines/m4/adv_r/conv.h
index 7b7d5720170..cfffe1c9c39 100644
--- a/engines/m4/adv_r/conv.h
+++ b/engines/m4/adv_r/conv.h
@@ -335,9 +335,9 @@ struct c_assign_chunk {
The same thing should work for boxes (b), (c), and (d).
*/
-extern void set_dlg_rect();
+void set_dlg_rect();
-extern void conv_go(Conv *c);
+void conv_go(Conv *c);
} // End of namespace M4
diff --git a/engines/m4/adv_r/conv_io.h b/engines/m4/adv_r/conv_io.h
index 96b1b66b9cb..e5e72dd96c4 100644
--- a/engines/m4/adv_r/conv_io.h
+++ b/engines/m4/adv_r/conv_io.h
@@ -95,60 +95,60 @@ struct Converstation_Globals {
void conv_go(Conv *c);
};
-extern Conv *conv_load(const char *filename, int x1, int y1, int32 myTrigger, bool want_box = true);
-extern void conv_load_and_prepare(const char *filename, int trigger, bool ignoreIt = false);
+Conv *conv_load(const char *filename, int x1, int y1, int32 myTrigger, bool want_box = true);
+void conv_load_and_prepare(const char *filename, int trigger, bool ignoreIt = false);
-extern void conv_unload(Conv *c);
-extern void conv_unload();
-extern void conv_shutdown();
+void conv_unload(Conv *c);
+void conv_unload();
+void conv_shutdown();
-extern Conv *conv_get_handle();
-extern void conv_set_handle(Conv *c);
+Conv *conv_get_handle();
+void conv_set_handle(Conv *c);
-extern void conv_resume(Conv *c);
-extern void conv_resume();
-extern void conv_reset(char *filename);
+void conv_resume(Conv *c);
+void conv_resume();
+void conv_reset(char *filename);
-extern void conv_reset_all();
-extern void conv_play(Conv *c);
+void conv_reset_all();
+void conv_play(Conv *c);
-extern void set_conv_name(const char *s);
-extern const char *get_conv_name();
-extern const char *conv_sound_to_play();
-extern int32 conv_whos_talking();
+void set_conv_name(const char *s);
+const char *get_conv_name();
+const char *conv_sound_to_play();
+int32 conv_whos_talking();
-extern int32 conv_get_decl_val(decl_chunk *decl);
-extern void conv_set_decl_val(decl_chunk *decl, int32 val);
-extern void conv_export_value(Conv *c, int32 val, int index);
-extern void conv_export_value_curr(int32 val, int index);
-extern void conv_export_pointer(Conv *c, int32 *val, int index);
-extern void conv_export_pointer_curr(int32 *val, int index);
+int32 conv_get_decl_val(decl_chunk *decl);
+void conv_set_decl_val(decl_chunk *decl, int32 val);
+void conv_export_value(Conv *c, int32 val, int index);
+void conv_export_value_curr(int32 val, int index);
+void conv_export_pointer(Conv *c, int32 *val, int index);
+void conv_export_pointer_curr(int32 *val, int index);
-extern void conv_set_font_spacing(int32 h, int32 v);
-extern void conv_set_text_colour(int32 norm_colour, int32 hi_colour);
+void conv_set_font_spacing(int32 h, int32 v);
+void conv_set_text_colour(int32 norm_colour, int32 hi_colour);
-extern void conv_set_text_colours(int32 norm_colour, int32 norm_colour_alt1, int32 norm_colour_alt2,
+void conv_set_text_colours(int32 norm_colour, int32 norm_colour_alt1, int32 norm_colour_alt2,
int32 hi_colour, int32 hi_colour_alt1, int32 hi_colour_alt2);
-extern void conv_set_shading(int32 shade);
-extern void conv_set_box_xy(int32 x, int32 y);
-extern void conv_get_dlg_coords(int32 *x1, int32 *y1, int32 *x2, int32 *y2);
-extern void conv_set_dlg_coords(int32 x1, int32 y1, int32 x2, int32 y2);
-extern void conv_set_default_text_colour(int32 norm_colour, int32 hi_colour);
-extern void conv_set_default_hv(int32 h, int32 v);
-
-extern int conv_get_event();
-extern void conv_set_event(int e);
-extern int conv_is_event_ready();
-
-extern void conv_swap_words(Conv *c);
-extern int32 conv_current_node();
-extern int32 conv_current_entry();
-
-extern int conv_toggle_flags(entry_chunk *entry);
-extern int ok_status(entry_chunk *entry);
-extern int conv_get_text(int32 offset, int32 size, Conv *c);
-extern void cdd_init();
+void conv_set_shading(int32 shade);
+void conv_set_box_xy(int32 x, int32 y);
+void conv_get_dlg_coords(int32 *x1, int32 *y1, int32 *x2, int32 *y2);
+void conv_set_dlg_coords(int32 x1, int32 y1, int32 x2, int32 y2);
+void conv_set_default_text_colour(int32 norm_colour, int32 hi_colour);
+void conv_set_default_hv(int32 h, int32 v);
+
+int conv_get_event();
+void conv_set_event(int e);
+int conv_is_event_ready();
+
+void conv_swap_words(Conv *c);
+int32 conv_current_node();
+int32 conv_current_entry();
+
+int conv_toggle_flags(entry_chunk *entry);
+int ok_status(entry_chunk *entry);
+int conv_get_text(int32 offset, int32 size, Conv *c);
+void cdd_init();
} // End of namespace M4
diff --git a/engines/m4/adv_r/db_env.h b/engines/m4/adv_r/db_env.h
index 9eb04a8c7ea..700ccf1ae84 100644
--- a/engines/m4/adv_r/db_env.h
+++ b/engines/m4/adv_r/db_env.h
@@ -27,8 +27,8 @@
namespace M4 {
-extern char *env_find(const Common::String &descName);
-extern char *env_get_path(char *resultPath, int room_num, char *fileName);
+char *env_find(const Common::String &descName);
+char *env_get_path(char *resultPath, int room_num, char *fileName);
} // End of namespace M4
diff --git a/engines/m4/adv_r/other.h b/engines/m4/adv_r/other.h
index a51ddde1fa0..4874705189b 100644
--- a/engines/m4/adv_r/other.h
+++ b/engines/m4/adv_r/other.h
@@ -27,7 +27,7 @@
namespace M4 {
-extern void other_save_game_for_resurrection();
+void other_save_game_for_resurrection();
} // namespace M4
More information about the Scummvm-git-logs
mailing list