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

Merge branch 'anyc-testing'

Browse Source
This commit is contained in:
IntelOrca
2014-05-25 14:02:23 +01:00
parent 249567e99a 73c5184f44
commit 27d630d551
6 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gfx.c
View File

@@ -83,7 +83,7 @@ int gfx_load_g1()
}
// Unsuccessful
RCT2_ERR("Unable to load g1.dat");
RCT2_ERROR("Unable to load g1.dat");
return 0;
}

1
src/peep.c
View File

@@ -18,6 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
#include <windows.h>
#include "addresses.h"
#include "news_item.h"
#include "peep.h"

3
src/rct2.h
View File

@@ -50,9 +50,8 @@ typedef unsigned long long uint64;
#ifdef _MSC_VER
#define RCT2_ERROR(format,...) fprintf(stderr, "ERROR %s:%s():%d: " format "\n", __FILE__, __FUNCTION__, __LINE__, __VA_ARGS__);
#else
#define RCT2_ERROR(format,...) fprintf(stderr, "ERROR %s:%s():%d: " format "\n", __FILE__, __func__, __LINE__, __VA_ARGS__);
#define RCT2_ERROR(format,...) fprintf(stderr, "ERROR %s:%s():%d: " format "\n", __FILE__, __func__, __LINE__, ## __VA_ARGS__);
#endif
#define RCT2_ERR(msg) RCT2_ERROR("%s",msg)
#ifndef _MSC_VER
// use similar struct packing as MSVC for our structs

1
src/sawyercoding.c
View File

@@ -18,6 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
#include <windows.h>
#include <string.h>
#include "addresses.h"
#include "rct2.h"

6
src/scenario_list.c
View File

@@ -169,7 +169,7 @@ static int scenario_scores_load()
// Try and load the scores file
file = fopen(get_file_path(PATH_ID_SCORES), "rb");
if (file == NULL) {
RCT2_ERR("Unable to load scenario scores.");
RCT2_ERROR("Unable to load scenario scores.");
return 0;
}
@@ -177,7 +177,7 @@ static int scenario_scores_load()
rct_scenario_scores_header header;
if (fread(&header, 16, 1, file) != 1) {
fclose(file);
RCT2_ERR("Invalid header in scenario scores file.");
RCT2_ERROR("Invalid header in scenario scores file.");
return 0;
}
gScenarioListCount = header.scenario_count;
@@ -210,7 +210,7 @@ int scenario_scores_save()
file = fopen(get_file_path(PATH_ID_SCORES), "wb");
if (file == NULL) {
RCT2_ERR("Unable to save scenario scores.");
RCT2_ERROR("Unable to save scenario scores.");
return 0;
}

2
src/window_save_prompt.c
View File

@@ -247,7 +247,7 @@ static void window_save_prompt_mouseup()
switch (widgetIndex) {
case WIDX_SAVE:
// TODO to avoid data loss, treat SAVE as CANCEL
RCT2_ERROR("%s", "TODO\n");
RCT2_ERROR("TODO");
window_close(w);
window_save_prompt_close();
return;