backup/planetblupi
1
0
Fork 0
mirror of https://github.com/blupi-games/planetblupi synced 2024-12-30 10:15:36 +01:00
Code Issues Projects Releases Activity

Use SDL_main properly

Browse Source
This commit is contained in:
Mathieu Schroeter 2017-02-09 23:06:36 +01:00
parent fe253c08a3
commit c3d9dd6e48
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
blupi.cpp
View File

@ -1,14 +1,10 @@
// blupi.cpp // blupi.cpp
// //
#include "blupi.h"
#define WIN32_LEAN_AND_MEAN
#define SDL_MAIN_HANDLED
#include <SDL.h> #include <SDL.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include "blupi.h"
#include "def.h" #include "def.h"
#include "resource.h" #include "resource.h"
#include "pixmap.h" #include "pixmap.h"
@ -66,7 +62,7 @@ int GetNum(char *p)
// Lit le fichier de configuration. // Lit le fichier de configuration.
bool ReadConfig(LPSTR lpCmdLine) bool ReadConfig(int argc, char *argv[])
{ {
FILE* file = nullptr; FILE* file = nullptr;
char buffer[200]; char buffer[200];
@ -412,15 +408,14 @@ bool InitFail(char *msg, bool bDirectX)
// Initialisation de l'application. // Initialisation de l'application.
static bool DoInit(LPSTR lpCmdLine, int nCmdShow) static bool DoInit(int argc, char *argv[])
{ {
POINT totalDim, iconDim; POINT totalDim, iconDim;
RECT rcRect; RECT rcRect;
bool bOK; bool bOK;
bOK = ReadConfig(lpCmdLine); // lit le fichier config.def bOK = ReadConfig(argc, argv); // lit le fichier config.def
SDL_SetMainReady ();
auto res = SDL_Init (SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER); auto res = SDL_Init (SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER);
if (res < 0) if (res < 0)
return false; return false;
@ -623,11 +618,10 @@ static bool DoInit(LPSTR lpCmdLine, int nCmdShow)
// Programme principal. // Programme principal.
int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, int main (int argc, char *argv[])
LPSTR lpCmdLine, int nCmdShow)
{ {
if (!DoInit(lpCmdLine, nCmdShow)) if (!DoInit(argc, argv))
return false; return -1;
SDL_TimerID updateTimer = SDL_AddTimer (g_timerInterval, [] (Uint32 interval, void *param) -> Uint32 SDL_TimerID updateTimer = SDL_AddTimer (g_timerInterval, [] (Uint32 interval, void *param) -> Uint32
{ {