Don't include vector in state.h

This commit is contained in:
twinaphex 2017-02-18 15:49:50 +01:00
parent 39185a61a1
commit 9a75c06b8f
3 changed files with 4 additions and 7 deletions

View File

@ -331,8 +331,6 @@ typedef struct
const char *cspecial; /* Special cart expansion: DIP switches, barcode reader, etc. */
std::vector<const char *>DesiredInput; // Desired input device for the input ports, NULL for don't care
double mouse_sensitivity;
} MDFNGI;

View File

@ -19,6 +19,8 @@
#include <boolean.h>
#include <vector>
#include "mednafen.h"
#include "driver.h"
#include "general.h"
@ -373,7 +375,7 @@ static int ReadStateChunk(StateMem *st, SFORMAT *sf, int size)
}
/* This function is called by the game driver(NES, GB, GBA) to save a state. */
int MDFNSS_StateAction(void *st_p, int load, int data_only, std::vector <SSDescriptor> &sections)
static int MDFNSS_StateAction_internal(void *st_p, int load, int data_only, std::vector <SSDescriptor> &sections)
{
StateMem *st = (StateMem*)st_p;
std::vector<SSDescriptor>::iterator section;
@ -447,7 +449,7 @@ int MDFNSS_StateAction(void *st_p, int load, int data_only, SFORMAT *sf, const c
std::vector <SSDescriptor> love;
love.push_back(SSDescriptor(sf, name, optional));
return(MDFNSS_StateAction(st, load, 0, love));
return(MDFNSS_StateAction_internal(st, load, 0, love));
}
int MDFNSS_SaveSM(void *st_p, int, int, const void*, const void*, const void*)

View File

@ -89,8 +89,6 @@ INLINE uint32_t SF_FORCE_D(double *) { return(0); }
#define SFEND { 0, 0, 0, 0 }
#include <vector>
// State-Section Descriptor
class SSDescriptor
{
@ -111,7 +109,6 @@ class SSDescriptor
bool optional;
};
int MDFNSS_StateAction(void *st, int load, int data_only, std::vector <SSDescriptor> &sections);
int MDFNSS_StateAction(void *st, int load, int data_only, SFORMAT *sf, const char *name, bool optional = 0);
#endif