aboutsummaryrefslogtreecommitdiff
path: root/engines/agi
diff options
context:
space:
mode:
Diffstat (limited to 'engines/agi')
-rw-r--r--engines/agi/agi.h7
-rw-r--r--engines/agi/console.h6
-rw-r--r--engines/agi/graphics.h6
-rw-r--r--engines/agi/keyboard.h6
-rw-r--r--engines/agi/list.h20
-rw-r--r--engines/agi/logic.h6
-rw-r--r--engines/agi/lzw.h7
-rw-r--r--engines/agi/menu.h7
-rw-r--r--engines/agi/opcodes.h6
-rw-r--r--engines/agi/picture.h6
-rw-r--r--engines/agi/savegame.h6
-rw-r--r--engines/agi/sound.h7
-rw-r--r--engines/agi/sprite.h6
-rw-r--r--engines/agi/text.h6
-rw-r--r--engines/agi/view.h6
15 files changed, 54 insertions, 54 deletions
diff --git a/engines/agi/agi.h b/engines/agi/agi.h
index 60afe27faa..b3d143b98c 100644
--- a/engines/agi/agi.h
+++ b/engines/agi/agi.h
@@ -22,8 +22,8 @@
*
*/
-#ifndef __AGI_H
-#define __AGI_H
+#ifndef AGI_H
+#define AGI_H
#include "common/stdafx.h"
#include "common/scummsys.h"
@@ -42,7 +42,6 @@ typedef signed int Err;
/*
* Version and other definitions
*/
-#define INLINE __inline
#define VERSION __DATE__ " " __TIME__
#define USE_CONSOLE
@@ -523,4 +522,4 @@ int agi_is_keypress_low();
} // End of namespace Agi
-#endif /* __AGI_H */
+#endif /* AGI_H */
diff --git a/engines/agi/console.h b/engines/agi/console.h
index 1a211f9826..9043f8906f 100644
--- a/engines/agi/console.h
+++ b/engines/agi/console.h
@@ -22,8 +22,8 @@
*
*/
-#ifndef __AGI_CONSOLE_H
-#define __AGI_CONSOLE_H
+#ifndef AGI_CONSOLE_H
+#define AGI_CONSOLE_H
namespace Agi {
@@ -68,4 +68,4 @@ void report(char *, ...);
} // End of namespace Agi
-#endif /* __AGI_CONSOLE_H */
+#endif /* AGI_CONSOLE_H */
diff --git a/engines/agi/graphics.h b/engines/agi/graphics.h
index 9d7cf20be6..e851e0ff75 100644
--- a/engines/agi/graphics.h
+++ b/engines/agi/graphics.h
@@ -22,8 +22,8 @@
*
*/
-#ifndef __AGI_GRAPHICS_H
-#define __AGI_GRAPHICS_H
+#ifndef AGI_GRAPHICS_H
+#define AGI_GRAPHICS_H
#include "common/stdafx.h"
@@ -80,4 +80,4 @@ void poll_timer(void);
} // End of namespace Agi
-#endif /* __AGI_GRAPHICS_H */
+#endif /* AGI_GRAPHICS_H */
diff --git a/engines/agi/keyboard.h b/engines/agi/keyboard.h
index d121b5012f..1042f4e8d7 100644
--- a/engines/agi/keyboard.h
+++ b/engines/agi/keyboard.h
@@ -22,8 +22,8 @@
*
*/
-#ifndef __AGI_KEYBOARD_H
-#define __AGI_KEYBOARD_H
+#ifndef AGI_KEYBOARD_H
+#define AGI_KEYBOARD_H
#include "common/stdafx.h"
@@ -89,4 +89,4 @@ int wait_any_key(void);
} // End of namespace Agi
-#endif /* __AGI_KEYBOARD_H */
+#endif /* AGI_KEYBOARD_H */
diff --git a/engines/agi/list.h b/engines/agi/list.h
index 999c591ce0..440536362a 100644
--- a/engines/agi/list.h
+++ b/engines/agi/list.h
@@ -4,8 +4,8 @@
* List management macros from the Linux kernel
*/
-#ifndef _LINUX_LIST_H
-#define _LINUX_LIST_H
+#ifndef AGI_IST_H
+#define AGI_LIST_H
#include "agi/agi.h"
@@ -40,7 +40,7 @@ struct list_head {
* This is only for internal list manipulation where we know
* the prev/next entries already!
*/
-static INLINE void __list_add(struct list_head *tnew, struct list_head *prev, struct list_head *next) {
+static FORCEINLINE void __list_add(struct list_head *tnew, struct list_head *prev, struct list_head *next) {
next->prev = tnew;
tnew->next = next;
tnew->prev = prev;
@@ -55,7 +55,7 @@ static INLINE void __list_add(struct list_head *tnew, struct list_head *prev, st
* @param new new entry to be added
* @param head list head to add it after
*/
-static INLINE void list_add(struct list_head *tnew, struct list_head *head) {
+static FORCEINLINE void list_add(struct list_head *tnew, struct list_head *head) {
__list_add(tnew, head, head->next);
}
@@ -67,7 +67,7 @@ static INLINE void list_add(struct list_head *tnew, struct list_head *head) {
* @new: new entry to be added
* @head: list head to add it before
*/
-static INLINE void list_add_tail(struct list_head *tnew, struct list_head *head) {
+static FORCEINLINE void list_add_tail(struct list_head *tnew, struct list_head *head) {
__list_add(tnew, head->prev, head);
}
@@ -77,7 +77,7 @@ static INLINE void list_add_tail(struct list_head *tnew, struct list_head *head)
* This is only for internal list manipulation where we know
* the prev/next entries already!
*/
-static INLINE void __list_del(struct list_head *prev, struct list_head *next) {
+static FORCEINLINE void __list_del(struct list_head *prev, struct list_head *next) {
next->prev = prev;
prev->next = next;
}
@@ -86,7 +86,7 @@ static INLINE void __list_del(struct list_head *prev, struct list_head *next) {
* deletes entry from list.
* @param entry the element to delete from the list.
*/
-static INLINE void list_del(struct list_head *entry) {
+static FORCEINLINE void list_del(struct list_head *entry) {
__list_del(entry->prev, entry->next);
}
@@ -94,7 +94,7 @@ static INLINE void list_del(struct list_head *entry) {
* tests whether a list is empty
* @param head the list to test.
*/
-static INLINE int list_empty(struct list_head *head) {
+static FORCEINLINE int list_empty(struct list_head *head) {
return head->next == head;
}
@@ -103,7 +103,7 @@ static INLINE int list_empty(struct list_head *head) {
* @param list the new list to add.
* @param head the place to add it in the first list.
*/
-static INLINE void list_splice(struct list_head *list, struct list_head *head) {
+static FORCEINLINE void list_splice(struct list_head *list, struct list_head *head) {
struct list_head *first = list->next;
if (first != list) {
@@ -137,4 +137,4 @@ static INLINE void list_splice(struct list_head *list, struct list_head *head) {
} // End of namespace Agi
-#endif
+#endif /* AGI_LIST_H */
diff --git a/engines/agi/logic.h b/engines/agi/logic.h
index cd6fbf752c..6922602517 100644
--- a/engines/agi/logic.h
+++ b/engines/agi/logic.h
@@ -22,8 +22,8 @@
*
*/
-#ifndef __AGI_LOGIC_H
-#define __AGI_LOGIC_H
+#ifndef AGI_LOGIC_H
+#define AGI_LOGIC_H
#include "agi/agi.h"
@@ -46,4 +46,4 @@ void unload_logic(int);
} // End of namespace Agi
-#endif /* __AGI_LOGIC_H */
+#endif /* AGI_LOGIC_H */
diff --git a/engines/agi/lzw.h b/engines/agi/lzw.h
index 5923f98055..2edb947e49 100644
--- a/engines/agi/lzw.h
+++ b/engines/agi/lzw.h
@@ -22,12 +22,13 @@
*
*/
-#ifndef __AGI_LZW_H
-#define __AGI_LZW_H
+#ifndef AGI_LZW_H
+#define AGI_LZW_H
namespace Agi {
void LZW_expand(uint8 *, uint8 *, int32);
} // End of namespace Agi
-#endif
+
+#endif /* AGI_LZW_H */
diff --git a/engines/agi/menu.h b/engines/agi/menu.h
index 095f802bd4..72c9087c7c 100644
--- a/engines/agi/menu.h
+++ b/engines/agi/menu.h
@@ -22,8 +22,8 @@
*
*/
-#ifndef __AGI_MENU_H
-#define __AGI_MENU_H
+#ifndef AGI_MENU_H
+#define AGI_MENU_H
namespace Agi {
@@ -43,4 +43,5 @@ int menu_keyhandler(int);
void menu_enable_all(void);
} // End of namespace Agi
-#endif
+
+#endif /* AGI_MENU_H */
diff --git a/engines/agi/opcodes.h b/engines/agi/opcodes.h
index 236ba19e68..02379373f5 100644
--- a/engines/agi/opcodes.h
+++ b/engines/agi/opcodes.h
@@ -22,8 +22,8 @@
*
*/
-#ifndef __AGI_OPCODES_H
-#define __AGI_OPCODES_H
+#ifndef AGI_OPCODES_H
+#define AGI_OPCODES_H
#include "agi/agi.h"
@@ -52,4 +52,4 @@ void patch_logic(int);
} // End of namespace Agi
-#endif /* __AGI_OPCODES_H */
+#endif /* AGI_OPCODES_H */
diff --git a/engines/agi/picture.h b/engines/agi/picture.h
index 0828cdecc1..0e1b5c9dd2 100644
--- a/engines/agi/picture.h
+++ b/engines/agi/picture.h
@@ -22,8 +22,8 @@
*
*/
-#ifndef __AGI_PICTURE_H
-#define __AGI_PICTURE_H
+#ifndef AGI_PICTURE_H
+#define AGI_PICTURE_H
#include "agi/agi.h"
@@ -44,4 +44,4 @@ uint8 *convert_v3_pic(uint8 *data, uint32 len);
} // End of namespace Agi
-#endif /* __AGI_PICTURE_H */
+#endif /* AGI_PICTURE_H */
diff --git a/engines/agi/savegame.h b/engines/agi/savegame.h
index ac62bb66e7..dea12243c8 100644
--- a/engines/agi/savegame.h
+++ b/engines/agi/savegame.h
@@ -22,8 +22,8 @@
*
*/
-#ifndef __AGI_SAVEGAME_H
-#define __AGI_SAVEGAME_H
+#ifndef AGI_SAVEGAME_H
+#define AGI_SAVEGAME_H
#include "agi/agi.h"
@@ -47,4 +47,4 @@ void release_image_stack(void);
} // End of namespace Agi
-#endif
+#endif /* AGI_SAVEGAME_H */
diff --git a/engines/agi/sound.h b/engines/agi/sound.h
index 7477aaf4dd..ac7afaafe4 100644
--- a/engines/agi/sound.h
+++ b/engines/agi/sound.h
@@ -22,8 +22,8 @@
*
*/
-#ifndef __AGI_SOUND_H
-#define __AGI_SOUND_H
+#ifndef AGI_SOUND_H
+#define AGI_SOUND_H
#include "agi/agi.h"
@@ -110,12 +110,11 @@ void deinit_sound(void);
void start_sound(int, int);
void stop_sound(void);
uint32 mix_sound(void);
-void __init_sound(void);
int load_instruments(char *fname);
extern struct sound_driver *snd;
-#endif /* __AGI_SOUND_H */
+#endif /* AGI_SOUND_H */
} // End of namespace Agi
diff --git a/engines/agi/sprite.h b/engines/agi/sprite.h
index a3d0d8b871..56ae762575 100644
--- a/engines/agi/sprite.h
+++ b/engines/agi/sprite.h
@@ -22,8 +22,8 @@
*
*/
-#ifndef __AGI_SPRITE_H
-#define __AGI_SPRITE_H
+#ifndef AGI_SPRITE_H
+#define AGI_SPRITE_H
namespace Agi {
@@ -44,4 +44,4 @@ void commit_block(int, int, int, int);
} // End of namespace Agi
-#endif /* __AGI_SPRITE_H */
+#endif /* AGI_SPRITE_H */
diff --git a/engines/agi/text.h b/engines/agi/text.h
index 4ce37bc7fb..d68a8db9c5 100644
--- a/engines/agi/text.h
+++ b/engines/agi/text.h
@@ -22,8 +22,8 @@
*
*/
-#ifndef __AGI_TEXT_H
-#define __AGI_TEXT_H
+#ifndef AGI_TEXT_H
+#define AGI_TEXT_H
#include "agi/agi.h"
@@ -45,4 +45,4 @@ void flush_lines(int, int);
} // End of namespace Agi
-#endif /* __AGI_TEXT_H */
+#endif /* AGI_TEXT_H */
diff --git a/engines/agi/view.h b/engines/agi/view.h
index 3394c8609a..414d6de01b 100644
--- a/engines/agi/view.h
+++ b/engines/agi/view.h
@@ -22,8 +22,8 @@
*
*/
-#ifndef __AGI_VIEW_H
-#define __AGI_VIEW_H
+#ifndef AGI_VIEW_H
+#define AGI_VIEW_H
namespace Agi {
@@ -139,4 +139,4 @@ void draw_obj(int);
} // End of namespace Agi
-#endif /* __AGI_VIEW_H */
+#endif /* AGI_VIEW_H */
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-12 15:41:44 +0000