backup/cnc-ddraw
1
0
Fork 0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-25 01:57:47 +01:00
Code Issues Projects Releases Activity

fix function names

Browse Source
This commit is contained in:
FunkyFr3sh 2018-08-03 03:37:23 +02:00
parent a4a452a7f2
commit 1402054259
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -3,6 +3,9 @@ WINDRES=windres
CFLAGS=-DHAVE_LIBPNG -Iinc -Wall -Wl,--enable-stdcall-fixup -O3 -s CFLAGS=-DHAVE_LIBPNG -Iinc -Wall -Wl,--enable-stdcall-fixup -O3 -s
LIBS=lib/libpng14.a lib/libz.a -lgdi32 -lopengl32 -lwinmm LIBS=lib/libpng14.a lib/libz.a -lgdi32 -lopengl32 -lwinmm
#CFLAGS=-Iinc -Wall -Wl,--enable-stdcall-fixup -O3 -s
#LIBS=-lgdi32 -lopengl32 -lwinmm
FILES = src/debug.c \ FILES = src/debug.c \
src/main.c \ src/main.c \
src/mouse.c \ src/mouse.c \
@ -18,6 +21,7 @@ FILES = src/debug.c \
all: all:
$(WINDRES) -J rc ddraw.rc ddraw.rc.o $(WINDRES) -J rc ddraw.rc ddraw.rc.o
$(CC) $(CFLAGS) -shared -o ddraw.dll $(FILES) ddraw.def ddraw.rc.o $(LIBS) $(CC) $(CFLAGS) -shared -o ddraw.dll $(FILES) ddraw.def ddraw.rc.o $(LIBS)
# $(CC) $(CFLAGS) -nostdlib -shared -o ddraw.dll $(FILES) ddraw.def ddraw.rc.o $(LIBS) -lkernel32 -luser32 -lmsvcrt
clean: clean:
rm -f ddraw.dll rm -f ddraw.dll

3
src/main.c
View File

@ -48,6 +48,7 @@ int WindowPosX;
int WindowPosY; int WindowPosY;
char SettingsIniPath[MAX_PATH]; char SettingsIniPath[MAX_PATH];
//BOOL WINAPI DllMainCRTStartup(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved)
BOOL WINAPI DllMain(HANDLE hDll, DWORD dwReason, LPVOID lpReserved) BOOL WINAPI DllMain(HANDLE hDll, DWORD dwReason, LPVOID lpReserved)
{ {
switch (dwReason) switch (dwReason)
@ -983,7 +984,7 @@ HRESULT WINAPI DirectDrawCreate(GUID FAR* lpGUID, LPDIRECTDRAW FAR* lplpDD, IUnk
char cwd[MAX_PATH]; char cwd[MAX_PATH];
char tmp[256]; char tmp[256];
GetCurrentDirectoryA(sizeof(cwd), cwd); GetCurrentDirectoryA(sizeof(cwd), cwd);
snprintf(SettingsIniPath, sizeof(SettingsIniPath), "%s\\ddraw.ini", cwd); _snprintf(SettingsIniPath, sizeof(SettingsIniPath), "%s\\ddraw.ini", cwd);
if(GetFileAttributes(SettingsIniPath) == 0xFFFFFFFF) if(GetFileAttributes(SettingsIniPath) == 0xFFFFFFFF)
{ {

2
src/render_soft.c
View File

@ -63,7 +63,7 @@ DWORD WINAPI render_soft_main(void)
if (!ddraw->windowed) if (!ddraw->windowed)
PostMessage(ddraw->hWnd, WM_AUTORENDERER, 0, 0); PostMessage(ddraw->hWnd, WM_AUTORENDERER, 0, 0);
snprintf( _snprintf(
warningText, sizeof(warningText), warningText, sizeof(warningText),
"-WARNING- Using slow software rendering, please update your graphics card driver (%s)", "-WARNING- Using slow software rendering, please update your graphics card driver (%s)",
strlen(OpenglVersion) > 10 ? "" : OpenglVersion); strlen(OpenglVersion) > 10 ? "" : OpenglVersion);

2
src/screenshot.c
View File

@ -55,7 +55,7 @@ BOOL screenshot(struct IDirectDrawSurfaceImpl *src)
} }
strftime(str_time, 64, "%Y-%m-%d-%H_%M_%S", localtime(&t)); strftime(str_time, 64, "%Y-%m-%d-%H_%M_%S", localtime(&t));
snprintf(filename, 128, "%s-%s.png", title, str_time); _snprintf(filename, 128, "%s-%s.png", title, str_time);
if(!src || !src->palette) if(!src || !src->palette)
{ {