ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Windows Port: Fix compiling on Windows. (Regression from commit 11cf901.)

This commit is contained in:
rogerman 2017-08-24 15:28:46 -07:00
parent 11cf901336
commit 823e9edf7f
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desmume/src/frontend/windows/memView.cpp
View File

@ -591,7 +591,7 @@ INT_PTR CALLBACK MemView_DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
{
case MEMVIEW_ARM9:
case MEMVIEW_ARM7:
DEBUG_dumpMemory(&f);
DEBUG_dumpMemory(f);
break;
default:
{

4
desmume/src/frontend/windows/mic-win.cpp
View File

@ -205,10 +205,10 @@ bool LoadSample(const char *name)
return false;
}
if (!formatChunk(&inf))
if (!formatChunk(inf))
return false;
if (!dataChunk(&inf))
if (!dataChunk(inf))
{
MessageBox(0,"not a valid WAVE file. some unknown problem.",0,0);
return false;

2
desmume/src/frontend/windows/replay.cpp
View File

@ -125,7 +125,7 @@ void Describe(HWND hwndDlg)
EMUFILE_FILE fp(playfilename,"rb");
if(fp.fail()) return;
MovieData md;
LoadFM2(md, &fp, INT_MAX, false);
LoadFM2(md, fp, INT_MAX, false);
u32 num_frames = md.records.size();

8
desmume/src/lua-engine.cpp
View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2009-2016 DeSmuME team
Copyright (C) 2009-2017 DeSmuME team
This file is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -2080,7 +2080,7 @@ DEFINE_LUA_FUNCTION(state_save, "location[,option]")
if((*ppEmuFile)->fail())
luaL_error(L, "failed to save, savestate object was dead.");
savestate_save(*ppEmuFile, 0);
savestate_save(**ppEmuFile, 0);
if((*ppEmuFile)->fail())
luaL_error(L, "failed to save savestate!");
@ -2135,7 +2135,7 @@ DEFINE_LUA_FUNCTION(state_load, "location[,option]")
if((*ppEmuFile)->size() == 0)
luaL_error(L, "failed to load, savestate wasn't saved first.");
savestate_load(*ppEmuFile);
savestate_load(**ppEmuFile);
if((*ppEmuFile)->fail())
luaL_error(L, "failed to load savestate!");
@ -2276,7 +2276,7 @@ DEFINE_LUA_FUNCTION(state_verify, "location[,option]")
luaL_error(L, "failed to verify, savestate object was dead.");
EMUFILE_MEMORY_VERIFIER verifier (*ppEmuFile);
savestate_save(&verifier, 0);
savestate_save(verifier, 0);
if(verifier.differences.size())
{
fputs("\n", stdout);