[Scummvm-git-logs] scummvm master -> 254391a53f42cee0bc6b53a9e1a19164ca8cacd8
dreammaster
noreply at scummvm.org
Fri Apr 24 11:17:04 UTC 2026
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
4e31a90dfa MADS: PHANTOM: Fix initialization of player, player2
5f7b80311b MADS: PHANTOM: Fix initialization of popup
99ac0a2602 MADS: PHANTOM: Compiler warning fixes
254391a53f MADS: PHANTOM: Further warning fixes
Commit: 4e31a90dfaac6859c5856b723a019017692df4f1
https://github.com/scummvm/scummvm/commit/4e31a90dfaac6859c5856b723a019017692df4f1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-04-24T21:16:52+10:00
Commit Message:
MADS: PHANTOM: Fix initialization of player, player2
Changed paths:
engines/mads/madsv2/core/player.cpp
engines/mads/madsv2/core/player.h
engines/mads/madsv2/engine.cpp
engines/mads/madsv2/engine.h
diff --git a/engines/mads/madsv2/core/player.cpp b/engines/mads/madsv2/core/player.cpp
index 25bf044cca9..baa1288dd50 100644
--- a/engines/mads/madsv2/core/player.cpp
+++ b/engines/mads/madsv2/core/player.cpp
@@ -37,12 +37,19 @@
namespace MADS {
namespace MADSV2 {
-Player player = { 0 };
-Player2 player2 = { 0 };
+Player player;
+Player2 player2;
+
+static const byte player_facing_to_series[10] = { 0, 7, 4, 3, 6, 0, 2, 5, 0, 1 };
+const byte player_clockwise[10] = { 9, 4, 1, 2, 7, 9, 3, 8, 9, 6 };
+static const byte player_counter_clockwise[10] = { 7, 2, 3, 6, 1, 7, 9, 4, 7, 8 };
+
+
+void init_player() {
+ memset(&player, 0, sizeof(Player));
+ memset(&player2, 0, sizeof(Player2));
+}
-byte player_facing_to_series[10] = { 0, 7, 4, 3, 6, 0, 2, 5, 0, 1 };
-byte player_clockwise[10] = { 9, 4, 1, 2, 7, 9, 3, 8, 9, 6 };
-byte player_counter_clockwise[10] = { 7, 2, 3, 6, 1, 7, 9, 4, 7, 8 };
void Player::synchronize(Common::Serializer &s) {
s.syncAsSint16LE(walking);
diff --git a/engines/mads/madsv2/core/player.h b/engines/mads/madsv2/core/player.h
index 3abe30f2292..e4c39382081 100644
--- a/engines/mads/madsv2/core/player.h
+++ b/engines/mads/madsv2/core/player.h
@@ -155,9 +155,7 @@ struct Player2 {
extern Player player;
extern Player2 player2;
-extern byte player_facing_to_series[10];
-extern byte player_clockwise[10];
-extern byte player_counter_clockwise[10];
+extern const byte player_clockwise[10];
/* player.h */
@@ -165,6 +163,7 @@ extern byte player_counter_clockwise[10];
#define player_said_2(aa, bb) (player_parse (words_##aa, words_##bb, 0) )
#define player_said_3(aa, bb, cc) (player_parse (words_##aa, words_##bb, words_##cc, 0) )
+extern void init_player();
/**
* Loads up the next designated sprite for the active stop walker sequence.
diff --git a/engines/mads/madsv2/engine.cpp b/engines/mads/madsv2/engine.cpp
index 5eb8fab7da6..fee56dc0858 100644
--- a/engines/mads/madsv2/engine.cpp
+++ b/engines/mads/madsv2/engine.cpp
@@ -31,6 +31,7 @@
#include "mads/madsv2/core/kernel.h"
#include "mads/madsv2/core/matte.h"
#include "mads/madsv2/core/object.h"
+#include "mads/madsv2/core/player.h"
#include "mads/madsv2/core/timer.h"
#include "mads/madsv2/phantom/main.h"
#include "mads/core/sound.h"
@@ -56,6 +57,8 @@ MADSV2Engine::MADSV2Engine(OSystem *syst, const MADSGameDescription *gameDesc) :
MADSEngine(syst, gameDesc) {
g_engine = this;
_speechFlag = true;
+
+ initGlobals();
}
MADSV2Engine::~MADSV2Engine() {
@@ -64,6 +67,10 @@ MADSV2Engine::~MADSV2Engine() {
delete _soundManager;
}
+void MADSV2Engine::initGlobals() {
+ init_player();
+}
+
void MADSV2Engine::readConfigFile() {
read_config_file();
_musicFlag = config_file.music_flag;
diff --git a/engines/mads/madsv2/engine.h b/engines/mads/madsv2/engine.h
index b6d07936c79..6a76fffae3c 100644
--- a/engines/mads/madsv2/engine.h
+++ b/engines/mads/madsv2/engine.h
@@ -37,8 +37,9 @@ namespace MADSV2 {
class MADSV2Engine : public MADSEngine {
private:
+ void initGlobals();
void syncGame(Common::Serializer &s);
-
+
protected:
Graphics::Screen *_screen = nullptr;
Common::Stack<Common::KeyState> _keyEvents;
Commit: 5f7b80311b1172954926cfa60e774983f521d78f
https://github.com/scummvm/scummvm/commit/5f7b80311b1172954926cfa60e774983f521d78f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-04-24T21:16:53+10:00
Commit Message:
MADS: PHANTOM: Fix initialization of popup
Changed paths:
engines/mads/madsv2/core/player.cpp
engines/mads/madsv2/core/popup.cpp
engines/mads/madsv2/core/popup.h
engines/mads/madsv2/engine.cpp
diff --git a/engines/mads/madsv2/core/player.cpp b/engines/mads/madsv2/core/player.cpp
index baa1288dd50..debbb1449e6 100644
--- a/engines/mads/madsv2/core/player.cpp
+++ b/engines/mads/madsv2/core/player.cpp
@@ -385,7 +385,7 @@ void player_set_facing() {
int mode;
int s1, s2;
int angle_factor;
- word ddx, ddy, dddx;
+ word dddx;
word ssy;
word pixels;
@@ -405,9 +405,6 @@ void player_set_facing() {
dy = ABS(dy);
ds = ABS(s2 - s1);
- ddx = ((word)dx) * 100;
- ddy = ((word)dy) * 100;
-
dddx = ((word)dx) * 33;
angle_factor = 100 + (player.scaling_velocity ? (ds * 3) : 0);
diff --git a/engines/mads/madsv2/core/popup.cpp b/engines/mads/madsv2/core/popup.cpp
index e111f6c4668..9f361c4c414 100644
--- a/engines/mads/madsv2/core/popup.cpp
+++ b/engines/mads/madsv2/core/popup.cpp
@@ -43,10 +43,19 @@
namespace MADS {
namespace MADSV2 {
-
#define popup_padding_width 3 /* Extra space on each side */
-Box text_box = { false };
+byte popup_colors[24] = {
+ 18, 19, 20, 21, 22, 23, 24, 25,
+ 25, 24, 0, 0, 0, 3, 0, 0,
+ 0, 0, 0, 0, 3, 0, 0, 0
+};
+
+int popup_preserve_initiator[3] = {
+ BUFFER_PRESERVE, BUFFER_PRESERVE, BUFFER_PRESERVE
+};
+
+Box text_box;
Box *box = &text_box;
int popup_key = 0;
@@ -55,20 +64,32 @@ int popup_asking_number = false;
int popup_available = false;
-int popup_preserve_initiator[3] = { BUFFER_PRESERVE,
- BUFFER_PRESERVE,
- BUFFER_PRESERVE };
-
-byte popup_colors[24] = { 18, 19, 20, 21, 22, 23, 24, 25,
- 25, 24, 0, 0, 0, 3, 0, 0,
- 0, 0, 0, 0, 3, 0, 0, 0 };
-
BoxParam box_param = { NULL };
Popup *popup = NULL;
word popup_default_status = POPUP_STATUS_BAR;
static char *popup_savelist_string(PopupItem *item, int element);
+void init_popup() {
+ memset(&box_param, 0, sizeof(BoxParam));
+ memset(&text_box, 0, sizeof(Box));
+ box = &text_box;
+
+ popup_key = 0;
+ popup_esc_key = false;
+ popup_asking_number = false;
+ popup_available = false;
+ popup = NULL;
+ popup_default_status = POPUP_STATUS_BAR;
+
+ static const byte POPUP_COLORS[24] = {
+ 18, 19, 20, 21, 22, 23, 24, 25,
+ 25, 24, 0, 0, 0, 3, 0, 0,
+ 0, 0, 0, 0, 3, 0, 0, 0
+ };
+ Common::copy(POPUP_COLORS, POPUP_COLORS + 24, popup_colors);
+ memset(popup_preserve_initiator, BUFFER_PRESERVE, 3);
+}
int popup_create(int horiz_pieces, int x, int y) {
int error_flag = true;
@@ -207,8 +228,8 @@ void popup_add_string(const char *string) {
void popup_write_string(const char *string) {
- char word[80];
- char word2[80];
+ char wordStr[80];
+ char word2Str[80];
const char *marker;
char *word_ptr;
int any_space;
@@ -223,7 +244,7 @@ void popup_write_string(const char *string) {
while (*marker != 0) {
- word_ptr = word;
+ word_ptr = wordStr;
any_space = false;
any_hyphen = false;
cr = false;
@@ -278,30 +299,30 @@ void popup_write_string(const char *string) {
*word_ptr = 0;
- len = strlen(word);
+ len = strlen(wordStr);
if (len > 0) {
- if (word[len - 1] == 0x20) {
- word[len - 1] = 0;
+ if (wordStr[len - 1] == 0x20) {
+ wordStr[len - 1] = 0;
}
}
- word2[0] = 0;
+ word2Str[0] = 0;
if ((box->text_x > 0) && !box->dont_add_space) {
- Common::strcat_s(word2, " ");
+ Common::strcat_s(word2Str, " ");
}
- Common::strcat_s(word2, word);
+ Common::strcat_s(word2Str, wordStr);
box->dont_add_space = stop_on_hyphen;
- len = strlen(word2);
- width = font_string_width(box_param.font, word2, POPUP_SPACING); // - POPUP_SPACING
+ len = strlen(word2Str);
+ width = font_string_width(box_param.font, word2Str, POPUP_SPACING); // - POPUP_SPACING
if (((box->text_x + len) > box->text_width) || ((box->cursor_x + width) > box->text_xs)) {
popup_next_line();
- popup_add_string(word);
+ popup_add_string(wordStr);
} else {
- popup_add_string(word2);
+ popup_add_string(word2Str);
}
if (cr) popup_next_line();
}
@@ -866,7 +887,7 @@ done:
void popup_update_ask(char *string, int maxlen) {
- int x1, y1, x2, x3, xs, ys, xs2, xs3;
+ int x1, y1, x2, x3, xs, ys, xs2;
xs = box->text_xs;
ys = (box_param.font->max_y_size + 1);
@@ -886,7 +907,6 @@ void popup_update_ask(char *string, int maxlen) {
xs2 = (font_string_width(box_param.font, "W", box_param.font_spacing) * maxlen) + 4;
x3 = x2 + 2;
- xs3 = font_string_width(box_param.font, string, box_param.font_spacing) + 2;
buffer_rect_fill(scr_main, x2 - 1, y1 - 3, xs2, 1, 0);
buffer_rect_fill(scr_main, x2 - 1, y1 + ys, xs2, 1, 0);
diff --git a/engines/mads/madsv2/core/popup.h b/engines/mads/madsv2/core/popup.h
index 1f39e8c7073..50713b37337 100644
--- a/engines/mads/madsv2/core/popup.h
+++ b/engines/mads/madsv2/core/popup.h
@@ -402,7 +402,6 @@ extern int popup_asking_number;
extern int popup_available;
-
extern int popup_preserve_initiator[3];
extern byte popup_colors[24];
@@ -410,6 +409,7 @@ extern byte popup_num_colors;
extern BoxParam box_param;
+extern void init_popup();
int popup_create(int horiz_pieces, int x, int y);
void popup_add_icon(SeriesPtr series, int id, int center);
diff --git a/engines/mads/madsv2/engine.cpp b/engines/mads/madsv2/engine.cpp
index fee56dc0858..b2aafec582a 100644
--- a/engines/mads/madsv2/engine.cpp
+++ b/engines/mads/madsv2/engine.cpp
@@ -32,6 +32,7 @@
#include "mads/madsv2/core/matte.h"
#include "mads/madsv2/core/object.h"
#include "mads/madsv2/core/player.h"
+#include "mads/madsv2/core/popup.h"
#include "mads/madsv2/core/timer.h"
#include "mads/madsv2/phantom/main.h"
#include "mads/core/sound.h"
@@ -69,6 +70,7 @@ MADSV2Engine::~MADSV2Engine() {
void MADSV2Engine::initGlobals() {
init_player();
+ init_popup();
}
void MADSV2Engine::readConfigFile() {
Commit: 99ac0a26028b113383bc29b11b6068342cde9462
https://github.com/scummvm/scummvm/commit/99ac0a26028b113383bc29b11b6068342cde9462
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-04-24T21:16:53+10:00
Commit Message:
MADS: PHANTOM: Compiler warning fixes
Changed paths:
engines/mads/madsv2/core/popup.cpp
engines/mads/madsv2/core/popup.h
diff --git a/engines/mads/madsv2/core/popup.cpp b/engines/mads/madsv2/core/popup.cpp
index 9f361c4c414..7eeb7c43dd5 100644
--- a/engines/mads/madsv2/core/popup.cpp
+++ b/engines/mads/madsv2/core/popup.cpp
@@ -1341,10 +1341,7 @@ Popup *popup_dialog_create(void *memory, long heap_size, int max_items) {
if ((heap_size == 0) && (memory == NULL)) heap_size = 2048;
if (!max_items) max_items = 10;
- if (heap_size < (sizeof(Popup) + 400)) goto done;
-
if (memory == NULL) {
-
status |= POPUP_STATUS_DYNAMIC;
block = (byte *)mem_get_name(heap_size, "$popheap");
if (block == NULL) goto done;
@@ -1353,9 +1350,7 @@ Popup *popup_dialog_create(void *memory, long heap_size, int max_items) {
memory = block;
} else {
-
dlg = (Popup *)memory;
-
}
heap_declare(&dlg->heap, MODULE_POPUP, (char *)memory + sizeof(Popup),
@@ -1877,7 +1872,6 @@ static int popup_button_x_size(PopupItem *item) {
static int popup_button_y_size(PopupItem *item) {
- item = NULL; // delete if this routine is to be used
return (box_param.font->max_y_size + 4 + 2);
}
@@ -2076,7 +2070,6 @@ static int popup_menu_x_size(PopupItem *item) {
static int popup_menu_y_size(PopupItem *item) {
- item = NULL; // delete if this routine is to be used
return(box_param.menu->index[0].ys);
}
@@ -3202,15 +3195,9 @@ PopupItem *popup_sprite(SeriesPtr series, int sprite, int x, int y) {
-PopupItem *popup_savelist(const char *data,
- const char *empty_string,
- int elements,
- int element_offset,
- int element_max_length,
- int pixel_width,
- int rows,
- int accept_input,
- int default_element) {
+PopupItem *popup_savelist(char *data, char *empty_string,
+ int elements, int element_offset, int element_max_length,
+ int pixel_width, int rows, int accept_input, int default_element) {
PopupItem *item;
PopupList *list;
PopupBuffer *buffer;
@@ -3229,8 +3216,8 @@ PopupItem *popup_savelist(const char *data,
item->list = list = list_allocate();
- item->prompt = (char *)empty_string;
- list->data = (char *)data;
+ item->prompt = empty_string;
+ list->data = data;
list->elements = elements;
list->element_offset = element_offset;
diff --git a/engines/mads/madsv2/core/popup.h b/engines/mads/madsv2/core/popup.h
index 50713b37337..6f9e41ab8df 100644
--- a/engines/mads/madsv2/core/popup.h
+++ b/engines/mads/madsv2/core/popup.h
@@ -467,15 +467,9 @@ PopupItem *popup_cancel_button(const char *prompt);
PopupItem *popup_message(const char *prompt, int x, int y);
PopupItem *popup_execute(void);
-PopupItem *popup_savelist(const char *data,
- const char *empty_string,
- int elements,
- int element_offset,
- int element_max_length,
- int pixel_width,
- int rows,
- int accept_input,
- int default_element);
+PopupItem *popup_savelist(char *data, char *empty_string,
+ int elements, int element_offset, int element_max_length,
+ int pixel_width, int rows, int accept_input, int default_element);
void popup_blank(int num_lines);
void popup_blank_line(void);
Commit: 254391a53f42cee0bc6b53a9e1a19164ca8cacd8
https://github.com/scummvm/scummvm/commit/254391a53f42cee0bc6b53a9e1a19164ca8cacd8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-04-24T21:16:53+10:00
Commit Message:
MADS: PHANTOM: Further warning fixes
Changed paths:
engines/mads/madsv2/core/speech.cpp
engines/mads/madsv2/core/sprite.cpp
engines/mads/madsv2/core/text.cpp
engines/mads/madsv2/core/tile.cpp
engines/mads/madsv2/core/vocab.cpp
engines/mads/madsv2/core/window.cpp
diff --git a/engines/mads/madsv2/core/speech.cpp b/engines/mads/madsv2/core/speech.cpp
index ad38696b5b6..fb9296e942c 100644
--- a/engines/mads/madsv2/core/speech.cpp
+++ b/engines/mads/madsv2/core/speech.cpp
@@ -68,7 +68,7 @@ void speech_shutdown() {
speech_system_active = false;
}
-Audio::AudioStream *speech_load(const char *resName, int id, bool useMainMemory) {
+Audio::AudioStream *speech_load(const char *resName, int id, bool) {
Common::MemoryReadStream *memStream;
Audio::AudioStream *audioStream = nullptr;
uint filePos;
@@ -77,9 +77,6 @@ Audio::AudioStream *speech_load(const char *resName, int id, bool useMainMemory)
byte *load_buf = nullptr;
int packing_flag;
- // Always use main memory in ScummVM
- useMainMemory = true;
-
// Open the sound resource for access
Common::SeekableReadStream *handle = env_open(resName);
if (!handle) goto done;
diff --git a/engines/mads/madsv2/core/sprite.cpp b/engines/mads/madsv2/core/sprite.cpp
index 6beed18d4ed..cb4a9bd9f7a 100644
--- a/engines/mads/madsv2/core/sprite.cpp
+++ b/engines/mads/madsv2/core/sprite.cpp
@@ -348,7 +348,6 @@ void FileSprite::load(Common::SeekableReadStream *src) {
SeriesPtr sprite_series_load(const char *filename, int load_flags) {
register int count;
- int len;
int len2;
int found, low_color, color_pointer;
byte *base_pointer;
@@ -402,7 +401,6 @@ SeriesPtr sprite_series_load(const char *filename, int load_flags) {
/* Determine length of header, and read it */
- len = sizeof(FileSeries) - sizeof(FileSprite);
if (!header.loadHeader(load_handle))
goto done;
@@ -772,9 +770,15 @@ word sprite_pack_line_irle(byte *target, Buffer *source, byte *palette_map, byte
/* if no more real pixels */
if (a == lastpel) {
switch (run_len) {
- case 3: *(unto++) = run_byte;
- case 2: *(unto++) = run_byte;
- case 1: *(unto++) = run_byte; break;
+ case 3:
+ *(unto++) = run_byte;
+ // Fall through
+ case 2:
+ *(unto++) = run_byte;
+ // Fall through
+ case 1:
+ *(unto++) = run_byte;
+ break;
default:
*(unto++) = SS_RUN; /* mark as a run */
*(unto++) = run_len;
@@ -826,9 +830,15 @@ word sprite_pack_line_irle(byte *target, Buffer *source, byte *palette_map, byte
}
switch (run_len) {
- case 3: *(unto++) = run_byte; /* intentional fall-through */
- case 2: *(unto++) = run_byte;
- case 1: *(unto++) = run_byte; break;
+ case 3:
+ *(unto++) = run_byte;
+ // Fall through
+ case 2:
+ *(unto++) = run_byte;
+ // Fall through
+ case 1:
+ *(unto++) = run_byte;
+ break;
default:
*(unto++) = SS_RUN; /* mark as a run */
*(unto++) = run_len;
@@ -1174,16 +1184,9 @@ void sprite_free(SeriesPtr *series, int free_memory) {
}
}
- if (kidney) {
- /* release the flag - dont deallocate the colors from the list */
- if ((*series)->color_handle)
- pal_deallocate((*series)->color_handle);
- /* flag_used[(*series)->color_handle] = false; */
- } else {
- /* deallocate the colors from the list */
- if ((*series)->color_handle)
- pal_deallocate((*series)->color_handle);
- }
+ // Deallocate the colors from the list
+ if ((*series)->color_handle)
+ pal_deallocate((*series)->color_handle);
if (free_memory)
mem_free(*series);
diff --git a/engines/mads/madsv2/core/text.cpp b/engines/mads/madsv2/core/text.cpp
index 8243a4eb02d..721293a4be3 100644
--- a/engines/mads/madsv2/core/text.cpp
+++ b/engines/mads/madsv2/core/text.cpp
@@ -416,7 +416,6 @@ int text_show(long id) {
int error_flag = true;
int center = false;
int cr;
- int tab;
int brackets_on = false;
int popup_created = false;
int underline = false;
@@ -453,8 +452,8 @@ int text_show(long id) {
cmd = command_buf;
center = false;
cr = false;
- tab = false;
underline = false;
+
while (*scan) {
if (*scan == TEXT_COMMAND) {
brackets_on = true;
diff --git a/engines/mads/madsv2/core/tile.cpp b/engines/mads/madsv2/core/tile.cpp
index f729fd5a3db..7eba68d1ea4 100644
--- a/engines/mads/madsv2/core/tile.cpp
+++ b/engines/mads/madsv2/core/tile.cpp
@@ -620,13 +620,6 @@ int tile_fake_map(int tile_type,
int x,
int y) {
int error_flag = true;
- int x_buffer;
-
- if (tile_type == TILE_PICTURE) {
- x_buffer = x;
- } else {
- x_buffer = x >> 1;
- }
tile_map->tile_type = tile_type;
tile_map->one_to_one = true;
diff --git a/engines/mads/madsv2/core/vocab.cpp b/engines/mads/madsv2/core/vocab.cpp
index 856f0fecb1f..69666afc1d9 100644
--- a/engines/mads/madsv2/core/vocab.cpp
+++ b/engines/mads/madsv2/core/vocab.cpp
@@ -95,7 +95,6 @@ int vocab_load(int allocation_flag) {
int mylen;
int more_words;
int vocab_space;
- int vocab_exist;
int vocab_address;
result = 0;
@@ -121,15 +120,11 @@ int vocab_load(int allocation_flag) {
delete handle;
if (more_words >= 0) {
-
vocab_words += more_words;
- vocab_exist = true;
} else {
result = VC_ERR_READMAINFILE;
}
- } else {
- vocab_exist = false;
}
} else {
result = VC_ERR_READHARDFILE;
diff --git a/engines/mads/madsv2/core/window.cpp b/engines/mads/madsv2/core/window.cpp
index 233f838ea8a..cc81dd0ca62 100644
--- a/engines/mads/madsv2/core/window.cpp
+++ b/engines/mads/madsv2/core/window.cpp
@@ -39,7 +39,7 @@ int window_line_type; /* Line type used to draw last window border */
WindowPtr trap_window;
-void (*(window_any_char_routine))() = NULL;
+void (*window_any_char_routine)() = NULL;
int window_num_trap_routines = 0;
byte *window_trap_routine[WINDOW_MAX_TRAP_ROUTINES];
char window_trap_string[WINDOW_MAX_TRAP_ROUTINES][WINDOW_TRAP_WIDTH];
@@ -521,7 +521,7 @@ byte *window_create(WindowPtr window) {
void window_destroy(WindowPtr window) {
byte *address;
byte *storage;
- int baseadd, nextadd, rowbump, memory;
+ int baseadd, nextadd, rowbump;
int width_bonus, height_bonus;
int width, height;
@@ -538,7 +538,6 @@ void window_destroy(WindowPtr window) {
width = (window->lr_x - window->ul_x) + width_bonus;
height = (window->lr_y - window->ul_y) + height_bonus;
rowbump = (nextadd - baseadd) - (width << 1);
- memory = (width * height) << 1;
mouse_hide();
@@ -670,25 +669,6 @@ void window_draw_box(WindowPtr window, int type) {
}
}
-/**
- * main interrupt 21 write string server
- */
-static void window_server(void) {
- error("TODO: window_server");
-}
-
-static void window_21_install() {
- error("TODO: window_21_install");
-}
-
-static void window_21_remove() {
- error("TODO: window_21_remove");
-}
-
-static void window_21_server() {
- error("TODO: window_21_server");
-}
-
void window_trap_output(WindowPtr window,
void (*(any_char_routine))(),
char *trap_string, ...) {
@@ -728,16 +708,10 @@ void window_trap_output(WindowPtr window,
next_trap_string = va_arg(marker, char *);
}
- window_21_install();
-
window_server_installed = true;
}
void window_restore_output(void) {
- if (window_server_installed) {
- window_21_remove();
- }
-
window_server_installed = false;
}
More information about the Scummvm-git-logs
mailing list