diff options
| author | jacob1 <jfu614@gmail.com> | 2012-09-04 00:21:55 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-09-06 23:53:04 (GMT) |
| commit | 66af9969d63736e7d68e7b79aa805d096a12d80e (patch) | |
| tree | 5570cd74ca451ca7817c62fa71b7fdde6c05f053 /src | |
| parent | f8f70a3f770b6cbc1e9c182572317c0968af718b (diff) | |
| download | powder-66af9969d63736e7d68e7b79aa805d096a12d80e.zip powder-66af9969d63736e7d68e7b79aa805d096a12d80e.tar.gz | |
Fix one more compiling error
(was using outdated SearchModel.h so reverted to official version)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Config.h | 2 | ||||
| -rw-r--r-- | src/Format.cpp | 2 | ||||
| -rw-r--r-- | src/search/SearchModel.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/Config.h b/src/Config.h index a0e5dfe..385f216 100644 --- a/src/Config.h +++ b/src/Config.h @@ -181,7 +181,7 @@ extern unsigned char ZSIZE; #ifdef WIN #define strcasecmp stricmp -#endif //_MSC_VER +#endif #if defined(_MSC_VER) #define fmin(a,b) (((a) < (b)) ? (a) : (b)) #define fminf(a,b) (((a) < (b)) ? (a) : (b)) diff --git a/src/Format.cpp b/src/Format.cpp index 78e4a4f..c290e71 100644 --- a/src/Format.cpp +++ b/src/Format.cpp @@ -4,7 +4,7 @@ #include <stdexcept> #include <iostream> #include <iterator> -#include "zlib.h" +#include <zlib.h> #include <stdio.h> #include "Format.h" #include "graphics/Graphics.h" diff --git a/src/search/SearchModel.h b/src/search/SearchModel.h index a2ea5b7..c894090 100644 --- a/src/search/SearchModel.h +++ b/src/search/SearchModel.h @@ -61,7 +61,7 @@ public: vector<SaveInfo*> GetSaveList(); vector<pair<string, int> > GetTagList(); string GetLastError() { return lastError; } - int GetPageCount() { return max(1, (int)(ceil(resultCount/16))); } + int GetPageCount() { return max(1, (int)(ceil(resultCount/16.0f))); } int GetPageNum() { return currentPage; } std::string GetLastQuery() { return lastQuery; } void SetSort(string sort) { if(!updateSaveListWorking) { currentSort = sort; } notifySortChanged(); } |
