mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Merge pull request #1920 from Gymnasiast/fix-warnings-2

Browse Source 
Fix more warnings
This commit is contained in:
Ted John
2015-09-12 13:54:22 +01:00
parent 70c88edb5d 68fc066fc5
commit daf61d0ca5
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/drawing/font.h
View File

@@ -22,7 +22,7 @@ enum {
};
typedef struct {
utf8 *filename;
const utf8 *filename;
int ptSize;
int offset_x;
int offset_y;
@@ -44,4 +44,4 @@ int font_get_size_from_sprite_base(uint16 spriteBase);
int font_get_line_height(int fontSpriteBase);
int font_get_line_height_small(int fontSpriteBase);
#endif
#endif

4
src/interface/console.c
View File

@@ -938,7 +938,7 @@ console_command console_command_table[] = {
{ "object_count", cc_object_count, "Shows the number of objects of each type in the scenario.", "object_count" },
{ "twitch", cc_twitch, "Twitch API" },
{ "reset_user_strings", cc_reset_user_strings, "Resets all user-defined strings, to fix incorrectly occurring 'Chosen name in use already' errors.", "reset_user_strings" },
{ "fix_banner_count", cc_fix_banner_count, "Fixes incorrectly appearing 'Too many banners' error by marking every banner entry without a map element as null..", "fix_banner_count" }
{ "fix_banner_count", cc_fix_banner_count, "Fixes incorrectly appearing 'Too many banners' error by marking every banner entry without a map element as null.", "fix_banner_count" }
};
static int cc_windows(const utf8 **argv, int argc) {
@@ -1038,7 +1038,7 @@ void console_execute_silent(const utf8 *src)
bool validCommand = false;
for (int i = 0; i < countof(console_command_table); i++) {
if (strcmp(argv[0], console_command_table[i].command) == 0) {
console_command_table[i].func(argv + 1, argc - 1);
console_command_table[i].func((const utf8 **)(argv + 1), argc - 1);
validCommand = true;
break;
}

4
src/interface/screenshot.c
View File

@@ -299,7 +299,7 @@ int screenshot_dump_png()
}
free(png);
if (pixels != dpi->bits) {
if ((utf8*)pixels != (utf8*)dpi->bits) {
free(pixels);
}
return index;
@@ -567,4 +567,4 @@ int cmdline_for_screenshot(const char **argv, int argc)
}
openrct2_dispose();
return 1;
}
}

2
src/platform/windows.c
View File

@@ -75,7 +75,7 @@ __declspec(dllexport) int StartOpenRCT(HINSTANCE hInstance, HINSTANCE hPrevInsta
// Get command line arguments in standard form
argv = CommandLineToArgvA(lpCmdLine, &argc);
runGame = cmdline_run(argv, argc);
runGame = cmdline_run((const char **)argv, argc);
GlobalFree(argv);
if (runGame)