Skip to content

Commit 5ae7b9d

Browse files
committed
SDL: fix error display regression
1 parent eb1b92e commit 5ae7b9d

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

src/common/extlib.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
#include <config.h>
1212
#endif
1313

14+
#include "common/smbas.h"
15+
1416
#if defined(__MINGW32__)
1517
#include <windows.h>
1618
#include <error.h>
@@ -23,7 +25,6 @@
2325
#endif
2426

2527
#if defined(LNX_EXTLIB) || defined(WIN_EXTLIB)
26-
#include "common/smbas.h"
2728
#include "common/extlib.h"
2829
#include "common/pproc.h"
2930
#include <dirent.h>
@@ -615,8 +616,7 @@ int slib_procexec(int lib_id, int index) { return 0; }
615616
int slib_get_kid(int lib_id, const char *name) { return -1; }
616617
int slib_get_module_id(const char *name, const char *alias) { return -1; }
617618
void slib_close() {}
618-
int slib_events(int wait_flag) { return 0; }
619619
void slib_init(int mcount, const char *mlist) {}
620-
void slib_setup_comp(int lib_id) {}
621-
void *slib_get_func(const char *name) {}
620+
void *slib_get_func(const char *name) { return 0; }
621+
void slib_import(int lib_id, int comp) {}
622622
#endif

src/platform/console/device.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ int osd_devinit() {
122122
}
123123
os_graf_mx = opt_pref_width;
124124
os_graf_my = opt_pref_height;
125+
setsysvar_int(SYSVAR_XMAX, os_graf_mx);
126+
setsysvar_int(SYSVAR_YMAX, os_graf_my);
125127

126128
if (p_write == NULL) {
127129
p_write = default_write;

src/platform/sdl/editor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ void System::editSource(String loadPath, bool restoreOnExit) {
240240
helpWidget->setText(gsb_last_errmsg);
241241
helpWidget->createStackTrace(gsb_last_errmsg, gsb_last_line, _stackTrace);
242242
widget = helpWidget;
243-
showHelpPopup(helpWidget);
243+
showHelpSideabar(helpWidget);
244244
_output->setStatus("Error. Esc=Close, Up/Down=Caller");
245245
} else {
246246
_output->setStatus(!gsb_last_errmsg[0] ? "Error" : gsb_last_errmsg);

0 commit comments

Comments
 (0)