[Scummvm-git-logs] scummvm master -> f3bfb81088d706308d2040a52c0aa51b3443aa29
digitall
noreply at scummvm.org
Mon Dec 25 23:34:13 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:
f3bfb81088 M4: Remove Some Unecessary Extern Declarations From Engine Headers
Commit: f3bfb81088d706308d2040a52c0aa51b3443aa29
https://github.com/scummvm/scummvm/commit/f3bfb81088d706308d2040a52c0aa51b3443aa29
Author: D G Turner (digitall at scummvm.org)
Date: 2023-12-25T23:33:38Z
Commit Message:
M4: Remove Some Unecessary Extern Declarations From Engine Headers
Changed paths:
engines/m4/adv_r/adv_control.h
engines/m4/dbg/dbg_wscript.h
engines/m4/gui/gui_buffer.h
engines/m4/gui/gui_dialog.h
engines/m4/gui/gui_item.h
engines/m4/gui/gui_mouse.h
engines/m4/gui/gui_sys.h
engines/m4/gui/gui_vmng_core.h
engines/m4/gui/gui_vmng_rectangles.h
engines/m4/gui/gui_vmng_screen.h
diff --git a/engines/m4/adv_r/adv_control.h b/engines/m4/adv_r/adv_control.h
index 570dd628e00..a2beb04b15e 100644
--- a/engines/m4/adv_r/adv_control.h
+++ b/engines/m4/adv_r/adv_control.h
@@ -28,13 +28,13 @@
namespace M4 {
-extern bool kernel_section_startup();
-extern void player_set_commands_allowed(bool t_or_f);
-extern void game_pause(bool flag);
-extern bool this_is_a_walkcode(int32 x, int32 y);
-extern int32 get_screen_depth(int32 x, int32 y);
-extern int32 get_screen_color(int32 x, int32 y);
-extern void update_mouse_pos_dialog();
+bool kernel_section_startup();
+void player_set_commands_allowed(bool t_or_f);
+void game_pause(bool flag);
+bool this_is_a_walkcode(int32 x, int32 y);
+int32 get_screen_depth(int32 x, int32 y);
+int32 get_screen_color(int32 x, int32 y);
+void update_mouse_pos_dialog();
} // End of namespace M4
diff --git a/engines/m4/dbg/dbg_wscript.h b/engines/m4/dbg/dbg_wscript.h
index 7fa4a3c0158..971a2a141ef 100644
--- a/engines/m4/dbg/dbg_wscript.h
+++ b/engines/m4/dbg/dbg_wscript.h
@@ -30,18 +30,17 @@
namespace M4 {
-extern bool dbg_ws_init(bool showTheScreen, Font *useThisFont, frac16 *theGlobals);
-extern void dbg_ws_shutdown();
-extern void dbg_ws_update();
+bool dbg_ws_init(bool showTheScreen, Font *useThisFont, frac16 *theGlobals);
+void dbg_ws_shutdown();
+void dbg_ws_update();
-extern void dbg_LaunchSequence(Anim8 *myAnim8);
-extern void dbg_DebugWSMach(machine *m, bool debug);
-extern void dbg_DebugNextCycle();
-extern void dbg_RemoveWSMach(machine *m);
-extern void dbg_SetCurrMachInstr(machine *m, int32 pcOffset);
-extern void dbg_SetCurrSequInstr(Anim8 *myAnim8, int32 compareCCR);
-extern void dbg_WSError(Common::WriteStream *logFile, machine *m, int32 errorType,
- const char *errDesc, const char *errMsg, int32 pcOffset);
+void dbg_LaunchSequence(Anim8 *myAnim8);
+void dbg_DebugWSMach(machine *m, bool debug);
+void dbg_DebugNextCycle();
+void dbg_RemoveWSMach(machine *m);
+void dbg_SetCurrMachInstr(machine *m, int32 pcOffset);
+void dbg_SetCurrSequInstr(Anim8 *myAnim8, int32 compareCCR);
+void dbg_WSError(Common::WriteStream *logFile, machine *m, int32 errorType, const char *errDesc, const char *errMsg, int32 pcOffset);
} // namespace M4
diff --git a/engines/m4/gui/gui_buffer.h b/engines/m4/gui/gui_buffer.h
index a09fd4267cf..6980c4383ad 100644
--- a/engines/m4/gui/gui_buffer.h
+++ b/engines/m4/gui/gui_buffer.h
@@ -32,12 +32,12 @@ namespace M4 {
/**
* Initialize any code associated with managing buffers in the GUI
*/
-extern bool gui_buffer_system_init();
+bool gui_buffer_system_init();
/**
* Shutdown any code associated with buffers management
*/
-extern void gui_buffer_system_shutdown();
+void gui_buffer_system_shutdown();
/**
* Register a Buffer with the view manager by creating a view mananger screen
@@ -52,12 +52,12 @@ extern void gui_buffer_system_shutdown();
* @remarks The user is responsible for keeping the Buffer *.
Any changes to the contents will be made by the user.
*/
-extern bool gui_buffer_register(int32 x1, int32 y1, Buffer *myBuf, uint32 scrnFlags, EventHandler evtHandler);
-extern void gui_buffer_deregister(void *myBuf);
+bool gui_buffer_register(int32 x1, int32 y1, Buffer *myBuf, uint32 scrnFlags, EventHandler evtHandler);
+void gui_buffer_deregister(void *myBuf);
-extern bool gui_GrBuff_register(int32 x1, int32 y1, GrBuff *myBuf, uint32 scrnFlags, EventHandler evtHandler);
-extern void gui_buffer_activate(Buffer *myBuf);
-extern bool gui_buffer_add_key(Buffer *myBuf, long myKey, HotkeyCB cb);
+bool gui_GrBuff_register(int32 x1, int32 y1, GrBuff *myBuf, uint32 scrnFlags, EventHandler evtHandler);
+void gui_buffer_activate(Buffer *myBuf);
+bool gui_buffer_add_key(Buffer *myBuf, long myKey, HotkeyCB cb);
/**
* Change which procedure will handle the events sent to the screen, which was
@@ -65,7 +65,7 @@ extern bool gui_buffer_add_key(Buffer *myBuf, long myKey, HotkeyCB cb);
* @param myBuf The Buffer specified.
* @param evtHandler The new procedure to handle keyboard and mouse events.
*/
-extern bool gui_buffer_set_event_handler(void *myBuf, EventHandler evtHandler);
+bool gui_buffer_set_event_handler(void *myBuf, EventHandler evtHandler);
} // End of namespace M4
diff --git a/engines/m4/gui/gui_dialog.h b/engines/m4/gui/gui_dialog.h
index 25ea4fc2982..8b77a0d3759 100644
--- a/engines/m4/gui/gui_dialog.h
+++ b/engines/m4/gui/gui_dialog.h
@@ -95,73 +95,73 @@ struct Dialog_Globals {
char listboxSearchStr[80] = { 0 };
};
-extern bool gui_dialog_init();
-extern void gui_dialog_shutdown();
+bool gui_dialog_init();
+void gui_dialog_shutdown();
//GENERAL DIALOG SUPPORT
-extern Dialog *DialogCreateAbsolute(int32 x1, int32 y1, int32 x2, int32 y2, uint32 scrnFlags);
-extern Dialog *DialogCreate(M4Rect *r, uint32 scrnFlags);
-extern void vmng_Dialog_Destroy(Dialog *d); //used only by viewmgr.cpp **DO NOT USE
-extern void DialogDestroy(Dialog *d, M4Rect *r = nullptr);
-extern void Dialog_Refresh(Dialog *d);
-extern void Dialog_Refresh_All();
-extern void Dialog_Resize(Dialog *d, int32 newW, int32 newH);
-extern bool GetDialogCoords(Dialog *d, M4Rect *r);
-extern void Dialog_Configure(Dialog *d, int32 defaultTag, int32 returnTag, int32 cancelTag);
-extern void Dialog_SetDefault(Dialog *d, int32 tag);
-extern bool Dialog_SetPressed(Dialog *d, int32 tag);
+Dialog *DialogCreateAbsolute(int32 x1, int32 y1, int32 x2, int32 y2, uint32 scrnFlags);
+Dialog *DialogCreate(M4Rect *r, uint32 scrnFlags);
+void vmng_Dialog_Destroy(Dialog *d); //used only by viewmgr.cpp **DO NOT USE
+void DialogDestroy(Dialog *d, M4Rect *r = nullptr);
+void Dialog_Refresh(Dialog *d);
+void Dialog_Refresh_All();
+void Dialog_Resize(Dialog *d, int32 newW, int32 newH);
+bool GetDialogCoords(Dialog *d, M4Rect *r);
+void Dialog_Configure(Dialog *d, int32 defaultTag, int32 returnTag, int32 cancelTag);
+void Dialog_SetDefault(Dialog *d, int32 tag);
+bool Dialog_SetPressed(Dialog *d, int32 tag);
//MESSAGE TYPE SUPPORT
-extern bool Dialog_Add_Message(Dialog *d, int32 x, int32 y, const char *prompt, int32 tag);
+bool Dialog_Add_Message(Dialog *d, int32 x, int32 y, const char *prompt, int32 tag);
//PICTURE TYPE SUPPORT
-extern bool Dialog_Add_Picture(Dialog *d, int32 x, int32 y, Buffer *myBuff, int32 tag);
+bool Dialog_Add_Picture(Dialog *d, int32 x, int32 y, Buffer *myBuff, int32 tag);
//BUTTON TYPE SUPPORT
-extern bool Dialog_Add_Button(Dialog *d, int32 x, int32 y, const char *prompt, M4CALLBACK cb, int32 tag);
-extern bool Dialog_Add_RepeatButton(Dialog *d, int32 x, int32 y, const char *prompt, M4CALLBACK cb, int32 tag);
+bool Dialog_Add_Button(Dialog *d, int32 x, int32 y, const char *prompt, M4CALLBACK cb, int32 tag);
+bool Dialog_Add_RepeatButton(Dialog *d, int32 x, int32 y, const char *prompt, M4CALLBACK cb, int32 tag);
//LIST TYPE SUPPORT
-extern bool Dialog_Add_List(Dialog *d, int32 x1, int32 y1, int32 x2, int32 y2, M4CALLBACK cb, int32 tag);
-extern bool Dialog_Add_DirList(Dialog *d, int32 x1, int32 y1, int32 x2, int32 y2, M4CALLBACK cb, int32 tag, char *myDir, char *myTypes);
-extern bool Dialog_Change_DirList(Dialog *d, Item *myItem, const char *myDir, const char *myTypes);
-extern bool Dialog_Add_List_Item(Dialog *d, Item *myItem, const char *prompt, int32 tag, int32 listTag, int32 addMode, bool refresh);
-extern bool Dialog_Delete_List_Item(Dialog *d, Item *myItem, int32 tag, ListItem *myListItem, int32 listTag);
-extern bool Dialog_Change_List_Item(Dialog *d, Item *myItem, int32 tag, ListItem *myListItem, int32 listTag, char *newPrompt, int32 newListTag, int32 changeMode, bool refresh);
-extern void Dialog_EmptyListBox(Dialog *d, Item *i, int32 tag);
-extern char *Dialog_GetListItemPrompt(Dialog *d, Item *i, int32 tag, int32 listTag);
-extern ListItem *Dialog_GetCurrListItem(Dialog *d, Item *i, int32 tag);
-extern char *Dialog_GetCurrListItemPrompt(Dialog *d, Item *i, int32 tag);
-extern bool Dialog_GetCurrListItemTag(Dialog *d, Item *i, int32 tag, int32 *listTag);
-extern bool Dialog_ListItemExists(Dialog *d, Item *myItem, int32 tag, char *prompt, int32 listTag);
-extern bool Dialog_ListboxSearch(Dialog *d, Item *myItem, int32 tag, int32 searchMode, char *searchStr, int32 parm1);
-extern void Dialog_GetPrevListItem(Dialog *d);
-extern void Dialog_GetNextListItem(Dialog *d);
+bool Dialog_Add_List(Dialog *d, int32 x1, int32 y1, int32 x2, int32 y2, M4CALLBACK cb, int32 tag);
+bool Dialog_Add_DirList(Dialog *d, int32 x1, int32 y1, int32 x2, int32 y2, M4CALLBACK cb, int32 tag, char *myDir, char *myTypes);
+bool Dialog_Change_DirList(Dialog *d, Item *myItem, const char *myDir, const char *myTypes);
+bool Dialog_Add_List_Item(Dialog *d, Item *myItem, const char *prompt, int32 tag, int32 listTag, int32 addMode, bool refresh);
+bool Dialog_Delete_List_Item(Dialog *d, Item *myItem, int32 tag, ListItem *myListItem, int32 listTag);
+bool Dialog_Change_List_Item(Dialog *d, Item *myItem, int32 tag, ListItem *myListItem, int32 listTag, char *newPrompt, int32 newListTag, int32 changeMode, bool refresh);
+void Dialog_EmptyListBox(Dialog *d, Item *i, int32 tag);
+char *Dialog_GetListItemPrompt(Dialog *d, Item *i, int32 tag, int32 listTag);
+ListItem *Dialog_GetCurrListItem(Dialog *d, Item *i, int32 tag);
+char *Dialog_GetCurrListItemPrompt(Dialog *d, Item *i, int32 tag);
+bool Dialog_GetCurrListItemTag(Dialog *d, Item *i, int32 tag, int32 *listTag);
+bool Dialog_ListItemExists(Dialog *d, Item *myItem, int32 tag, char *prompt, int32 listTag);
+bool Dialog_ListboxSearch(Dialog *d, Item *myItem, int32 tag, int32 searchMode, char *searchStr, int32 parm1);
+void Dialog_GetPrevListItem(Dialog *d);
+void Dialog_GetNextListItem(Dialog *d);
//TEXTFIELD TYPE SUPPORT
-extern bool Dialog_Add_TextField(Dialog *d, int32 x1, int32 y1, int32 x2, const char *defaultPrompt, M4CALLBACK cb, int32 tag, int32 fieldLength);
-extern void Dialog_RegisterTextField(Dialog *d);
+bool Dialog_Add_TextField(Dialog *d, int32 x1, int32 y1, int32 x2, const char *defaultPrompt, M4CALLBACK cb, int32 tag, int32 fieldLength);
+void Dialog_RegisterTextField(Dialog *d);
//HOTKEY SUPPORT
-extern bool Dialog_Add_Key(Dialog *d, long myKey, HotkeyCB cb);
-extern bool Dialog_Remove_Key(Dialog *d, long myKey);
+bool Dialog_Add_Key(Dialog *d, long myKey, HotkeyCB cb);
+bool Dialog_Remove_Key(Dialog *d, long myKey);
//GENERAL ITEM SUPPORT
-extern Item *Dialog_Get_Item(Dialog *d, int32 tag);
-extern void Dialog_Change_Item_Prompt(Dialog *d, const char *newPrompt, Item *myItem, int32 tag);
-extern bool Dialog_Remove_Item(Dialog *d, Item *myItem, int32 tag);
-extern void Dialog_Refresh_Item(Dialog *d, Item *myItem, int32 tag);
-extern void Dialog_KeyMouseCollision();
+Item *Dialog_Get_Item(Dialog *d, int32 tag);
+void Dialog_Change_Item_Prompt(Dialog *d, const char *newPrompt, Item *myItem, int32 tag);
+bool Dialog_Remove_Item(Dialog *d, Item *myItem, int32 tag);
+void Dialog_Refresh_Item(Dialog *d, Item *myItem, int32 tag);
+void Dialog_KeyMouseCollision();
-extern void Dialog_SystemError(char *s);
+void Dialog_SystemError(char *s);
-extern bool sizeofGUIelement_border(int16 el_type, int32 *w, int32 *h);
-extern bool sizeofGUIelement_interior(ButtonDrawRec *bdr, M4Rect *myRect);
-extern bool drawGUIelement(ButtonDrawRec *bdr, M4Rect *myRect);
+bool sizeofGUIelement_border(int16 el_type, int32 *w, int32 *h);
+bool sizeofGUIelement_interior(ButtonDrawRec *bdr, M4Rect *myRect);
+bool drawGUIelement(ButtonDrawRec *bdr, M4Rect *myRect);
-extern bool custom_drawGUIelement(ButtonDrawRec *bdr, M4Rect *myRect);
-extern bool custom_sizeofGUIelement_border(int16 el_type, int32 *w, int32 *h);
-extern bool custom_sizeofGUIelement_interior(ButtonDrawRec *bdr, M4Rect *myRect);
+bool custom_drawGUIelement(ButtonDrawRec *bdr, M4Rect *myRect);
+bool custom_sizeofGUIelement_border(int16 el_type, int32 *w, int32 *h);
+bool custom_sizeofGUIelement_interior(ButtonDrawRec *bdr, M4Rect *myRect);
//----------------------------------------------------------------------------------------
//TEXTSCRN STUFF...
diff --git a/engines/m4/gui/gui_item.h b/engines/m4/gui/gui_item.h
index 3d07c709c54..43ae1c76107 100644
--- a/engines/m4/gui/gui_item.h
+++ b/engines/m4/gui/gui_item.h
@@ -115,45 +115,45 @@ struct Item_Globals {
char clipBoard[100] = { 0 };
};
-extern bool InitItems(void);
-extern Item *Item_create(Item *parent, enum ItemType type, int32 tag, M4CALLBACK cb);
-extern void Item_destroy(Item *myItem);
-extern void Item_empty_list(Item *myItem);
-extern Item *ItemAdd(Item *itemList, int32 x, int32 y, int32 w, int32 h, const char *prompt, int32 tag,
+bool InitItems(void);
+Item *Item_create(Item *parent, enum ItemType type, int32 tag, M4CALLBACK cb);
+void Item_destroy(Item *myItem);
+void Item_empty_list(Item *myItem);
+Item *ItemAdd(Item *itemList, int32 x, int32 y, int32 w, int32 h, const char *prompt, int32 tag,
ItemType type, M4CALLBACK cb, int32 promptMax);
-extern Item *ItemFind(Item *itemList, int32 tag);
-extern bool Item_SetViewBottom(Item *i);
-extern bool ListItemExists(Item *myItem, char *prompt, int32 listTag);
-extern bool ListItemAdd(Item *myItem, char *prompt, int32 listTag, int32 addMode, ListItem *changedItem);
-extern bool ListItemDelete(Item *myItem, ListItem *myListItem, int32 listTag);
-extern bool ListItemChange(Item *myItem, ListItem *myListItem, int32 listTag,
+Item *ItemFind(Item *itemList, int32 tag);
+bool Item_SetViewBottom(Item *i);
+bool ListItemExists(Item *myItem, char *prompt, int32 listTag);
+bool ListItemAdd(Item *myItem, char *prompt, int32 listTag, int32 addMode, ListItem *changedItem);
+bool ListItemDelete(Item *myItem, ListItem *myListItem, int32 listTag);
+bool ListItemChange(Item *myItem, ListItem *myListItem, int32 listTag,
char *newPrompt, int32 newTag, int32 changeMode);
-extern void ViewCurrListItem(Item *myItem);
-extern ListItem *ListItemFind(Item *myItem, int32 searchMode, char *searchStr, int32 parm1);
-extern bool ListItemSearch(Item *myItem, int32 searchMode, char *searchStr, int32 parm1);
-extern bool DoubleClickOnListBox(Item *myItem, int32 xOffset, int32 yOffset);
-extern bool ClickOnListBox(Item *myItem, int32 xOffset, int32 yOffset, int32 scrollType);
-extern bool ResetDefaultListBox(Item *myItem);
-extern bool Item_change_prompt(Item *myItem, const char *newPrompt);
-extern void Item_ClearOrigPrompt(void);
-extern Item *Item_RestoreTextField(void);
-extern Item *Item_CheckTextField(void);
-extern void Item_SaveTextField(Item *myItem);
-extern void SetTextBlockBegin(Item *myItem, int32 relXPos);
-extern void SetTextBlockEnd(Item *myItem, int32 relXPos);
-extern bool Item_TextEdit(Item *myItem, int32 parm1);
-extern bool GetNextListItem(Item *myItem);
-extern bool GetNextPageList(Item *myItem);
-extern bool GetPrevListItem(Item *myItem);
-extern bool GetPrevPageList(Item *myItem);
-extern bool Item_show(Item *i, void *bdrDialog, Buffer *scrBuf, int32 itemType);
-extern void Item_format(Item *i);
-extern Item *Item_set_default(Item *itemList, Item *currDefault, int32 tag);
-extern Item *Item_set_pressed(Item *itemList, Item *myItem, int32 tag);
-extern Item *Item_set_unpressed(Item *itemList, Item *myItem, int32 tag);
-extern Item *Item_set_cancel(Item *itemList, int32 tag);
-extern Item *Item_set_next_default(Item *currDefault, Item *itemList);
-extern Item *Item_set_prev_default(Item *currDefault, Item *listBottom);
+void ViewCurrListItem(Item *myItem);
+ListItem *ListItemFind(Item *myItem, int32 searchMode, char *searchStr, int32 parm1);
+bool ListItemSearch(Item *myItem, int32 searchMode, char *searchStr, int32 parm1);
+bool DoubleClickOnListBox(Item *myItem, int32 xOffset, int32 yOffset);
+bool ClickOnListBox(Item *myItem, int32 xOffset, int32 yOffset, int32 scrollType);
+bool ResetDefaultListBox(Item *myItem);
+bool Item_change_prompt(Item *myItem, const char *newPrompt);
+void Item_ClearOrigPrompt(void);
+Item *Item_RestoreTextField(void);
+Item *Item_CheckTextField(void);
+void Item_SaveTextField(Item *myItem);
+void SetTextBlockBegin(Item *myItem, int32 relXPos);
+void SetTextBlockEnd(Item *myItem, int32 relXPos);
+bool Item_TextEdit(Item *myItem, int32 parm1);
+bool GetNextListItem(Item *myItem);
+bool GetNextPageList(Item *myItem);
+bool GetPrevListItem(Item *myItem);
+bool GetPrevPageList(Item *myItem);
+bool Item_show(Item *i, void *bdrDialog, Buffer *scrBuf, int32 itemType);
+void Item_format(Item *i);
+Item *Item_set_default(Item *itemList, Item *currDefault, int32 tag);
+Item *Item_set_pressed(Item *itemList, Item *myItem, int32 tag);
+Item *Item_set_unpressed(Item *itemList, Item *myItem, int32 tag);
+Item *Item_set_cancel(Item *itemList, int32 tag);
+Item *Item_set_next_default(Item *currDefault, Item *itemList);
+Item *Item_set_prev_default(Item *currDefault, Item *listBottom);
} // End of namespace M4
diff --git a/engines/m4/gui/gui_mouse.h b/engines/m4/gui/gui_mouse.h
index 34b28be5b61..807f366f3dc 100644
--- a/engines/m4/gui/gui_mouse.h
+++ b/engines/m4/gui/gui_mouse.h
@@ -66,14 +66,14 @@ struct Mouse_Globals {
int32 _oldY = MAX_VIDEO_Y >> 1; // position where the mouse sprite was last drawn is here.
};
-extern bool gui_mouse_init();
-extern void gui_mouse_shutdown();
-extern bool mouse_set_sprite(int32 spriteNum);
-extern void gui_mouse_refresh();
-extern void mouse_hide();
-extern void mouse_show();
-extern void mouse_lock_sprite(int32 mouseNum);
-extern void mouse_unlock_sprite();
+bool gui_mouse_init();
+void gui_mouse_shutdown();
+bool mouse_set_sprite(int32 spriteNum);
+void gui_mouse_refresh();
+void mouse_hide();
+void mouse_show();
+void mouse_lock_sprite(int32 mouseNum);
+void mouse_unlock_sprite();
} // End of namespace M4
diff --git a/engines/m4/gui/gui_sys.h b/engines/m4/gui/gui_sys.h
index c8e9bde5848..e7d4677eee1 100644
--- a/engines/m4/gui/gui_sys.h
+++ b/engines/m4/gui/gui_sys.h
@@ -28,15 +28,15 @@
namespace M4 {
-extern bool gui_system_init();
-extern void gui_system_shutdown();
+bool gui_system_init();
+void gui_system_shutdown();
/**
* Determine if an event happens, and if so, which window should process the event
* This is the main "engine call" of the GUI. It should be called once each time in the
* applications main loop. All "hot key" call backs, and evtHandlers are executed from here.
*/
-extern void gui_system_event_handler();
+void gui_system_event_handler();
/**
* Add a "hot key" to the system (as opposed to a specific window).
@@ -45,17 +45,17 @@ extern void gui_system_event_handler();
* @remarks If the view manager has not been initialized, or sizeof(Hotkey) memory is not available,
* the procedure will be aborted.
*/
-extern void AddSystemHotkey(int32 myKey, HotkeyCB callback);
+void AddSystemHotkey(int32 myKey, HotkeyCB callback);
/**
* Remove a "hot key" from the system
*/
-extern void RemoveSystemHotkey(int32 myKey);
+void RemoveSystemHotkey(int32 myKey);
/**
* To find the callback associated with a "hot key" in the system
*/
-extern HotkeyCB GetSystemHotkey(int32 myKey);
+HotkeyCB GetSystemHotkey(int32 myKey);
} // End of namespace M4
diff --git a/engines/m4/gui/gui_vmng_core.h b/engines/m4/gui/gui_vmng_core.h
index fc22d9bc262..2fd107715e7 100644
--- a/engines/m4/gui/gui_vmng_core.h
+++ b/engines/m4/gui/gui_vmng_core.h
@@ -34,7 +34,7 @@ namespace M4 {
* @remarks Should be called once during program initialization,
* after dpmi_init_mem() has been called.
*/
-extern bool vmng_init();
+bool vmng_init();
/**
* Shutdown the GUI view manager, and release all resources.
@@ -65,7 +65,7 @@ void vmng_shutdown();
* in the list of inactive windows. A call to vmng_screen_show() will activate
* (make visible) this window.
*/
-extern ScreenContext *vmng_screen_create(int32 x1, int32 y1, int32 x2, int32 y2, int32 scrnType, uint32 scrnFlags,
+ScreenContext *vmng_screen_create(int32 x1, int32 y1, int32 x2, int32 y2, int32 scrnType, uint32 scrnFlags,
void *scrnContent, RefreshFunc redraw, EventHandler evtHandler);
/**
@@ -78,13 +78,13 @@ extern ScreenContext *vmng_screen_create(int32 x1, int32 y1, int32 x2, int32 y2,
* @returns the ScreenContext* associated with the window which was created for
* the structure scrnContent. returns nullptr if now window was found.
*/
-extern ScreenContext *vmng_screen_find(void *scrnContent, int32 *status); // was FindScreen
+ScreenContext *vmng_screen_find(void *scrnContent, int32 *status); // was FindScreen
/**
* Remove a window from the active list, and place it on the inactive list
* @param The window identifier
*/
-extern void vmng_screen_hide(void *scrnContent); // was HideScreen
+void vmng_screen_hide(void *scrnContent); // was HideScreen
/**
* Place a window at the front of its layer on the active list.
@@ -93,7 +93,7 @@ extern void vmng_screen_hide(void *scrnContent); // was HideScreen
* into the list at the front of its layer (SF_BACKGRND, SF_DRIFTER, SF_FLOATER, or SF_SURFACE).
* If the window is already active, it will be moved to the front of its layer.
*/
-extern void vmng_screen_show(void *scrnContent); // was ShowScreen
+void vmng_screen_show(void *scrnContent); // was ShowScreen
/**
* Place a window at the back of its layer.
@@ -101,21 +101,21 @@ extern void vmng_screen_show(void *scrnContent); // was ShowScreen
* @remarks Essentially this procedure does the same as vmng_screen_show(),
* the only difference is that the window is at the back of its layer.
*/
-extern void vmng_screen_to_back(void *scrnContent); // was MoveScreenToBack
+void vmng_screen_to_back(void *scrnContent); // was MoveScreenToBack
/**
* Release all resources associated with the window.
* @param scrnContent The window Identifier.
*/
-extern void vmng_screen_dispose(void *scrnContent); // was DestroyScreen
+void vmng_screen_dispose(void *scrnContent); // was DestroyScreen
-extern void vmng_refresh_video(int32 scrnX, int32 scrnY, int32 x1, int32 y1, int32 x2, int32 y2, Buffer *srcBuffer);
+void vmng_refresh_video(int32 scrnX, int32 scrnY, int32 x1, int32 y1, int32 x2, int32 y2, Buffer *srcBuffer);
/**
* Remove the window from either the active list of windows, or the inactive list,
* wherever it was found.
*/
-extern ScreenContext *ExtractScreen(void *scrnContent, int32 status);
+ScreenContext *ExtractScreen(void *scrnContent, int32 status);
} // End of namespace M4
diff --git a/engines/m4/gui/gui_vmng_rectangles.h b/engines/m4/gui/gui_vmng_rectangles.h
index 7a1a2c5e1f4..a88ea9f55b0 100644
--- a/engines/m4/gui/gui_vmng_rectangles.h
+++ b/engines/m4/gui/gui_vmng_rectangles.h
@@ -28,14 +28,14 @@
namespace M4 {
-extern RectList *vmng_CreateNewRect(int32 x1, int32 y1, int32 x2, int32 y2);
-extern void vmng_AddRectToRectList(RectList **scrnRectList, int32 x1, int32 y1, int32 x2, int32 y2);
-extern RectList *vmng_DuplicateRectList(RectList *myRectList);
-extern bool vmng_RectIntersectsRectList(RectList *myRectList, int32 x1, int32 y1, int32 x2, int32 y2);
-extern bool vmng_RectListValid(RectList *myRectList);
-extern bool vmng_ClipRectList(RectList **myRectList, int32 clipX1, int32 clipY1, int32 clipX2, int32 clipY2);
-extern void vmng_DisposeRectList(RectList **rectList);
-extern void vmng_RemoveRectFromRectList(RectList **scrnRectList, int32 x1, int32 y1, int32 x2, int32 y2);
+RectList *vmng_CreateNewRect(int32 x1, int32 y1, int32 x2, int32 y2);
+void vmng_AddRectToRectList(RectList **scrnRectList, int32 x1, int32 y1, int32 x2, int32 y2);
+RectList *vmng_DuplicateRectList(RectList *myRectList);
+bool vmng_RectIntersectsRectList(RectList *myRectList, int32 x1, int32 y1, int32 x2, int32 y2);
+bool vmng_RectListValid(RectList *myRectList);
+bool vmng_ClipRectList(RectList **myRectList, int32 clipX1, int32 clipY1, int32 clipX2, int32 clipY2);
+void vmng_DisposeRectList(RectList **rectList);
+void vmng_RemoveRectFromRectList(RectList **scrnRectList, int32 x1, int32 y1, int32 x2, int32 y2);
} // End of namespace M4
diff --git a/engines/m4/gui/gui_vmng_screen.h b/engines/m4/gui/gui_vmng_screen.h
index 03cbbf5a6e2..0abc47299d1 100644
--- a/engines/m4/gui/gui_vmng_screen.h
+++ b/engines/m4/gui/gui_vmng_screen.h
@@ -36,7 +36,7 @@ namespace M4 {
* @param x2 Window bottom-right X
* @param y2 Window bottom-right Y
*/
-extern bool GetScreenCoords(void *scrnContent, int32 *x1, int32 *y1, int32 *x2, int32 *y2);
+bool GetScreenCoords(void *scrnContent, int32 *x1, int32 *y1, int32 *x2, int32 *y2);
/**
* Change which procedure will be called when a portion of the window
@@ -44,7 +44,7 @@ extern bool GetScreenCoords(void *scrnContent, int32 *x1, int32 *y1, int32 *x2,
* @param scrnContent The window identifier
* @param redraw The new refresh function pointer
*/
-extern bool vmng_SetScreenRefresh(void *scrnContent, RefreshFunc redraw);
+bool vmng_SetScreenRefresh(void *scrnContent, RefreshFunc redraw);
/**
* Add a "hot key" to a window.
@@ -53,7 +53,7 @@ extern bool vmng_SetScreenRefresh(void *scrnContent, RefreshFunc redraw);
* to be executed.
* @param callback The function to be executed when "myKey" is pressed
*/
-extern bool AddScreenHotkey(void *scrnContent, int32 myKey, HotkeyCB callback);
+bool AddScreenHotkey(void *scrnContent, int32 myKey, HotkeyCB callback);
/**
* Remove a hot key
@@ -62,17 +62,17 @@ extern bool AddScreenHotkey(void *scrnContent, int32 myKey, HotkeyCB callback);
* @returns False if either the window or the "hot key" could not be found,
* TRUE if successful
*/
-extern bool RemoveScreenHotkey(void *scrnContent, int32 myKey);
+bool RemoveScreenHotkey(void *scrnContent, int32 myKey);
/**
* Obvious shell to MoveScreen
*/
-extern bool MoveScreenAbs(ScreenContext *myScreen, int32 parmX, int32 parmY);
+bool MoveScreenAbs(ScreenContext *myScreen, int32 parmX, int32 parmY);
/**
* Obvious shell to MoveScreen
*/
-extern bool MoveScreenDelta(ScreenContext *myScreen, int32 parmX, int32 parmY);
+bool MoveScreenDelta(ScreenContext *myScreen, int32 parmX, int32 parmY);
/**
* Resize the windows width and/or height
@@ -80,7 +80,7 @@ extern bool MoveScreenDelta(ScreenContext *myScreen, int32 parmX, int32 parmY);
* @param newH The new height of the window. If <= 0, the old window height will remain.
* @returns TRUE if the window was found, FALSE otherwise
*/
-extern bool ResizeScreen(void *scrnContent, int32 newW, int32 newH);
+bool ResizeScreen(void *scrnContent, int32 newW, int32 newH);
/**
* Restore the monitor image by redrawing the visible portions of each window
@@ -90,17 +90,17 @@ extern bool ResizeScreen(void *scrnContent, int32 newW, int32 newH);
* @param updateX2 Rectangle bottom-right X
* @param updateY2 Rectangle bottom-right Y
*/
-extern void RestoreScreens(int32 updateX1, int32 updateY1, int32 updateX2, int32 updateY2);
+void RestoreScreens(int32 updateX1, int32 updateY1, int32 updateX2, int32 updateY2);
/**
* A shell to RestoreScreens
*/
-extern void RestoreScreensInContext(int32 x1, int32 y1, int32 x2, int32 y2, ScreenContext *myScreen);
+void RestoreScreensInContext(int32 x1, int32 y1, int32 x2, int32 y2, ScreenContext *myScreen);
/**
* Capture a screenshot to a bitmap.
*/
-extern void Screen2BuffC(int8 *Buff);
+void Screen2BuffC(int8 *Buff);
} // End of namespace M4
More information about the Scummvm-git-logs
mailing list