commit eec83b7d
Windows fixes
git-svn-id: https://blockattack.svn.sourceforge.net/svnroot/blockattack/trunk@77 9d7177f8-192b-0410-8f35-a16a89829b06
Changed files
diff --git a/source/code/BlockAttackWin32.dev b/source/code/BlockAttackWin32.dev
new file mode 100644
index 0000000..72b32f3
--- /dev/null
+++ b/source/code/BlockAttackWin32.dev
@@ -0,0 +1,469 @@
+[Project]
+FileName=BlockAttackWin32.dev
+Name=BlockAttackWin32
+UnitCount=20
+Type=0
+Ver=1
+ObjFiles=
+Includes=C:\LIB_SDL\SDL-1.2.10\include;C:\LIB_SDL\SDL_image-1.2.5\include;C:\LIB_SDL\SDL_mixer-1.2.7\include
+Libs=C:\LIB_SDL\SDL-1.2.10\lib;C:\LIB_SDL\SDL_image-1.2.5\lib;C:\LIB_SDL\SDL_mixer-1.2.7\lib
+PrivateResource=BlockAttackWin32_private.rc
+ResourceIncludes=
+MakeIncludes=
+Compiler=
+CppCompiler=
+Linker=-lmingw32 -lSDLmain -lSDL -lSDL_Mixer -lSDL_image_@@_../../../../../Dev-Cpp/lib/libwsock32.a_@@_../../../../../Dev-Cpp/lib/libws2_32.a_@@_../../../../../Dev-Cpp/lib/libenet.a_@@_-lwsock32_@@_-lwinmm_@@_-lws2_32_@@_
+IsCpp=1
+Icon=
+ExeOutput=..\..\Game
+ObjectOutput=Objects
+OverrideOutput=1
+OverrideOutputName=BlockAttackWin32.exe
+HostApplication=
+Folders=
+CommandLine=
+UseCustomMakefile=0
+CustomMakefile=
+IncludeVersionInfo=1
+SupportXPThemes=0
+CompilerSet=0
+CompilerSettings=0000000000000000000000
+
+[VersionInfo]
+Major=1
+Minor=3
+Release=2
+Build=27
+LanguageID=1033
+CharsetID=1252
+CompanyName=
+FileVersion=1.3.2
+FileDescription=Block Attack - Rise of the Blocks (tetris Attack Clone)
+InternalName=
+LegalCopyright=Poul Sander
+LegalTrademarks=
+OriginalFilename=
+ProductName=Block Attack - Rise of the Blocks
+ProductVersion=1.3.2
+AutoIncBuildNr=1
+
+[Unit1]
+FileName=BlockGame.hpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit2]
+FileName=highscore.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit3]
+FileName=highscore.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit4]
+FileName=joypad.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit5]
+FileName=joypad.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit6]
+FileName=listFiles.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit7]
+FileName=main.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit8]
+FileName=ReadKeyboard.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit9]
+FileName=ReadKeyboard.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit10]
+FileName=replay.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit11]
+FileName=replay.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit12]
+FileName=SFont.c
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit13]
+FileName=SFont.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit23]
+FileName=editor\editorMain.hpp
+CompileCpp=1
+Folder=editor
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit24]
+FileName=editor\editorMain.cpp
+CompileCpp=1
+Folder=editor
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit25]
+FileName=NetworkThing.hpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit26]
+FileName=mainVars.hpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit27]
+FileName=enet\memory.h
+CompileCpp=1
+Folder=enet
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit28]
+FileName=enet\packet.c
+CompileCpp=1
+Folder=enet
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit29]
+FileName=enet\peer.c
+CompileCpp=1
+Folder=enet
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit15]
+FileName=NetworkThing.hpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit30]
+FileName=enet\protocol.c
+CompileCpp=1
+Folder=enet
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit31]
+FileName=enet\protocol.h
+CompileCpp=1
+Folder=enet
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit32]
+FileName=enet\time.h
+CompileCpp=1
+Folder=enet
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit14]
+FileName=listFiles.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit33]
+FileName=poulsCommonWindows.hpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit34]
+FileName=editor\TheBoard.hpp
+CompileCpp=1
+Folder=editor
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit35]
+FileName=editor\BoardHolder.hpp
+CompileCpp=1
+Folder=editor
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit36]
+FileName=editor\EditorInterface.hpp
+CompileCpp=1
+Folder=editor
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit37]
+FileName=editor\TheBoard.cpp
+CompileCpp=1
+Folder=editor
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit38]
+FileName=editor\BoardHolder.cpp
+CompileCpp=1
+Folder=editor
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit39]
+FileName=editor\EditorInterface.cpp
+CompileCpp=1
+Folder=editor
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit40]
+FileName=editor\editorMain.hpp
+CompileCpp=1
+Folder=editor
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit41]
+FileName=editor\editorMain.cpp
+CompileCpp=1
+Folder=editor
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit42]
+FileName=NetworkThing.hpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit43]
+FileName=mainVars.hpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit16]
+FileName=mainVars.hpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit22]
+FileName=editor\EditorInterface.cpp
+CompileCpp=1
+Folder=editor
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit17]
+FileName=common.h
+CompileCpp=1
+Folder=BlockAttackWin32
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit18]
+FileName=common.cc
+CompileCpp=1
+Folder=BlockAttackWin32
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit19]
+FileName=stats.h
+CompileCpp=1
+Folder=BlockAttackWin32
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit20]
+FileName=stats.cc
+CompileCpp=1
+Folder=BlockAttackWin32
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
diff --git a/source/code/common.cc b/source/code/common.cc
index 0eec6bd..1618eac 100644
--- a/source/code/common.cc
+++ b/source/code/common.cc
@@ -83,7 +83,8 @@ int str2int(string str2parse)
string getMyDocumentsPath()
{
TCHAR pszPath[MAX_PATH];
- if (SUCCEEDED(SHGetSpecialFolderPath(NULL, pszPath, CSIDL_PERSONAL, FALSE))) {
+ //if (SUCCEEDED(SHGetSpecialFolderPath(NULL, pszPath, CSIDL_PERSONAL, FALSE))) {
+ if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, 0, pszPath))) {
// pszPath is now the path that you want
#if DEBUG
cout << "MyDocuments Located: " << pszPath << endl;
diff --git a/source/code/common.h b/source/code/common.h
index 77c6d51..98c0ef8 100644
--- a/source/code/common.h
+++ b/source/code/common.h
@@ -45,6 +45,10 @@ Copyright (C) 2008 Poul Sander
#include <fstream>
#include <map>
#include <stdlib.h>
+#ifdef WIN32
+#include "windows.h"
+#include "shlobj.h"
+#endif
using namespace std;
@@ -59,6 +63,10 @@ string itoa(int num);
string getPathToSaveFiles();
+#ifdef WIN32
+string getMyDocumentsPath();
+#endif
+
class TimeHandler
{
public:
diff --git a/source/code/listFiles.cpp b/source/code/listFiles.cpp
index 7dbaad9..b007450 100644
--- a/source/code/listFiles.cpp
+++ b/source/code/listFiles.cpp
@@ -46,8 +46,8 @@ void ListFiles::setDirectory(string directory)
filenames[i]="";
#if defined(_WIN32)
DWORD dwError;
- dictory+="/*";
- hFind = FindFirstFile(dictory.c_str(), &FindFileData);
+ directory+="/*";
+ hFind = FindFirstFile(directory.c_str(), &FindFileData);
if (hFind == INVALID_HANDLE_VALUE)
{
cout << "Invalid file handle. Error is " << GetLastError() << endl;
diff --git a/source/code/main.cpp b/source/code/main.cpp
index 1af4603..13055de 100644
--- a/source/code/main.cpp
+++ b/source/code/main.cpp
@@ -3273,7 +3273,7 @@ class Keymenu {
#if NETWORK
#include "NetworkThing.hpp"
-#include "MenuSystem.h"
+//#include "MenuSystem.h"
#endif
//The main function, quite big... too big
diff --git a/source/code/mainVars.hpp b/source/code/mainVars.hpp
index ea14264..54a7acb 100644
--- a/source/code/mainVars.hpp
+++ b/source/code/mainVars.hpp
@@ -357,4 +357,4 @@ ButtonCords cordRetryButton = {
cordRetryButton.ysize = buttonYsize
};
-#endif
\ No newline at end of file
+#endif
diff --git a/source/code/ttfont.h b/source/code/ttfont.h
index 3b0fd2f..3292c89 100644
--- a/source/code/ttfont.h
+++ b/source/code/ttfont.h
@@ -38,7 +38,7 @@ Copyright (C) 2008 Poul Sander
#include <iostream>
#include <string>
#include "SDL.h"
-#include "SDL_ttf.h" //To use True Type Fonts in SDL
+//#include "SDL_ttf.h" //To use True Type Fonts in SDL
using namespace std;