[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r3130 - in trunk/pingus: . src src/display src/editor src/i
|
From: |
jsalmon3 |
|
Subject: |
[Pingus-CVS] r3130 - in trunk/pingus: . src src/display src/editor src/input src/win32 |
|
Date: |
Wed, 12 Sep 2007 04:46:50 +0200 |
Author: jsalmon3
Date: 2007-09-12 04:46:40 +0200 (Wed, 12 Sep 2007)
New Revision: 3130
Modified:
trunk/pingus/pingus.vcproj
trunk/pingus/src/display/drawing_context.cpp
trunk/pingus/src/editor/editor_viewport.cpp
trunk/pingus/src/input/control.hpp
trunk/pingus/src/pathname.cpp
trunk/pingus/src/pathname.hpp
trunk/pingus/src/string_util.hpp
trunk/pingus/src/system.cpp
trunk/pingus/src/win32/config.h
Log:
Fixed compile errors and some warnings
Modified: trunk/pingus/pingus.vcproj
===================================================================
--- trunk/pingus/pingus.vcproj 2007-09-12 02:36:49 UTC (rev 3129)
+++ trunk/pingus/pingus.vcproj 2007-09-12 02:46:40 UTC (rev 3130)
@@ -559,6 +559,14 @@
>
</File>
<File
+ RelativePath=".\src\pathname.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\pathname.hpp"
+ >
+ </File>
+ <File
RelativePath=".\src\pingu.cpp"
>
</File>
@@ -1206,6 +1214,74 @@
Name="editor"
>
<File
+
RelativePath=".\src\editor\action_properties.cpp"
+ >
+ </File>
+ <File
+
RelativePath=".\src\editor\action_properties.hpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\editor\button.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\editor\button.hpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\editor\checkbox.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
ObjectFile="$(IntDir)\$(InputName)1.obj"
+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
ObjectFile="$(IntDir)\$(InputName)1.obj"
+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\src\editor\checkbox.hpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\editor\combobox.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
ObjectFile="$(IntDir)\$(InputName)1.obj"
+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
ObjectFile="$(IntDir)\$(InputName)1.obj"
+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\src\editor\combobox.hpp"
+ >
+ </File>
+ <File
RelativePath=".\src\editor\context_menu.cpp"
>
</File>
@@ -1238,6 +1314,54 @@
>
</File>
<File
+
RelativePath=".\src\editor\file_list.cpp"
+ >
+ </File>
+ <File
+
RelativePath=".\src\editor\file_list.hpp"
+ >
+ </File>
+ <File
+
RelativePath=".\src\editor\file_load_dialog.cpp"
+ >
+ </File>
+ <File
+
RelativePath=".\src\editor\file_load_dialog.hpp"
+ >
+ </File>
+ <File
+
RelativePath=".\src\editor\file_save_dialog.cpp"
+ >
+ </File>
+ <File
+
RelativePath=".\src\editor\file_save_dialog.hpp"
+ >
+ </File>
+ <File
+
RelativePath=".\src\editor\gui_style.cpp"
+ >
+ </File>
+ <File
+
RelativePath=".\src\editor\gui_style.hpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\editor\inputbox.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\editor\inputbox.hpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\editor\label.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\editor\label.hpp"
+ >
+ </File>
+ <File
RelativePath=".\src\editor\level_impl.hpp"
>
</File>
@@ -1250,6 +1374,30 @@
>
</File>
<File
+
RelativePath=".\src\editor\level_properties.cpp"
+ >
+ </File>
+ <File
+
RelativePath=".\src\editor\level_properties.hpp"
+ >
+ </File>
+ <File
+
RelativePath=".\src\editor\object_properties.cpp"
+ >
+ </File>
+ <File
+
RelativePath=".\src\editor\object_properties.hpp"
+ >
+ </File>
+ <File
+
RelativePath=".\src\editor\object_selector.cpp"
+ >
+ </File>
+ <File
+
RelativePath=".\src\editor\object_selector.hpp"
+ >
+ </File>
+ <File
RelativePath=".\src\editor\panel.cpp"
>
</File>
@@ -1318,6 +1466,14 @@
>
</File>
<File
+
RelativePath=".\src\gui\group_component.cpp"
+ >
+ </File>
+ <File
+
RelativePath=".\src\gui\group_component.hpp"
+ >
+ </File>
+ <File
RelativePath=".\src\gui\gui_manager.cpp"
>
</File>
@@ -1342,7 +1498,7 @@
>
</File>
<File
-
RelativePath=".\src\gui\input_debug_screen.hpp"
+
RelativePath=".\src\gui\rect_component.hpp"
>
</File>
<File
Modified: trunk/pingus/src/display/drawing_context.cpp
===================================================================
--- trunk/pingus/src/display/drawing_context.cpp 2007-09-12 02:36:49 UTC
(rev 3129)
+++ trunk/pingus/src/display/drawing_context.cpp 2007-09-12 02:46:40 UTC
(rev 3130)
@@ -407,13 +407,13 @@
float
DrawingContext::get_width() const
{
- return rect.get_width();
+ return (float)rect.get_width();
}
float
DrawingContext::get_height() const
{
- return rect.get_height();
+ return (float)rect.get_height();
}
void
Modified: trunk/pingus/src/editor/editor_viewport.cpp
===================================================================
--- trunk/pingus/src/editor/editor_viewport.cpp 2007-09-12 02:36:49 UTC (rev
3129)
+++ trunk/pingus/src/editor/editor_viewport.cpp 2007-09-12 02:46:40 UTC (rev
3130)
@@ -197,8 +197,8 @@
for (unsigned i = 0; i < selected_objs.size(); i++)
{
Vector3f orig_pos(selected_objs[i]->get_orig_pos());
- float x_offset = mouse_world_pos.x - drag_world_pos.x;
- float y_offset = mouse_world_pos.y - drag_world_pos.y;
+ float x_offset = (float)(mouse_world_pos.x - drag_world_pos.x);
+ float y_offset = (float)(mouse_world_pos.y - drag_world_pos.y);
if (snap_to)
{
Modified: trunk/pingus/src/input/control.hpp
===================================================================
--- trunk/pingus/src/input/control.hpp 2007-09-12 02:36:49 UTC (rev 3129)
+++ trunk/pingus/src/input/control.hpp 2007-09-12 02:46:40 UTC (rev 3130)
@@ -375,7 +375,7 @@
{}
void send_char(unsigned short c) { chr = c; notify_parent(); }
- unsigned char get_char() { return chr; }
+ unsigned short get_char() { return chr; }
};
class KeyboardGroup : public Keyboard
Modified: trunk/pingus/src/pathname.cpp
===================================================================
--- trunk/pingus/src/pathname.cpp 2007-09-12 02:36:49 UTC (rev 3129)
+++ trunk/pingus/src/pathname.cpp 2007-09-12 02:46:40 UTC (rev 3130)
@@ -28,6 +28,7 @@
Pathname Pathname::tmpfile(const std::string& prefix)
{
assert(!"Unimplemented");
+ return Pathname();
}
Pathname::Pathname()
@@ -54,6 +55,7 @@
default:
assert(!"Never reached");
}
+ return std::string();
}
std::string
@@ -102,7 +104,8 @@
default:
assert(!"never reached");
- }
+ }
+ return std::string();
}
std::ostream& operator<< (std::ostream& os, const Pathname& p)
@@ -121,6 +124,7 @@
default:
assert(!"never reached");
}
+ return os;
}
/* EOF */
Modified: trunk/pingus/src/pathname.hpp
===================================================================
--- trunk/pingus/src/pathname.hpp 2007-09-12 02:36:49 UTC (rev 3129)
+++ trunk/pingus/src/pathname.hpp 2007-09-12 02:46:40 UTC (rev 3130)
@@ -24,6 +24,7 @@
#include <iosfwd>
#include <string>
+#include "SDL.h"
/** Simple class to allow a distinction of paths that rever to the
* filesystem and paths that refer to the datadir, it also hides
Modified: trunk/pingus/src/string_util.hpp
===================================================================
--- trunk/pingus/src/string_util.hpp 2007-09-12 02:36:49 UTC (rev 3129)
+++ trunk/pingus/src/string_util.hpp 2007-09-12 02:46:40 UTC (rev 3130)
@@ -54,7 +54,7 @@
t = tmp;
return true;
}
- return tmp;
+ return false;
}
template<class T>
Modified: trunk/pingus/src/system.cpp
===================================================================
--- trunk/pingus/src/system.cpp 2007-09-12 02:36:49 UTC (rev 3129)
+++ trunk/pingus/src/system.cpp 2007-09-12 02:46:40 UTC (rev 3130)
@@ -113,11 +113,11 @@
{
if (coFindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
{
- dir_list.push_back(DirectoryEntry(coFindData.cFileName,
DirectoryEntry::DE_DIRECTORY));
+ dir_list.push_back(DirectoryEntry(coFindData.cFileName,
System::DE_DIRECTORY));
}
else
{
- dir_list.push_back(DirectoryEntry(coFindData.cFileName,
DirectoryEntry::DE_FILE));
+ dir_list.push_back(DirectoryEntry(coFindData.cFileName,
System::DE_FILE));
}
}
while (FindNextFile(hFind,&coFindData));
Modified: trunk/pingus/src/win32/config.h
===================================================================
--- trunk/pingus/src/win32/config.h 2007-09-12 02:36:49 UTC (rev 3129)
+++ trunk/pingus/src/win32/config.h 2007-09-12 02:46:40 UTC (rev 3130)
@@ -4,12 +4,12 @@
#include <assert.h>
#define PACKAGE "Pingus"
-#define VERSION "0.7.0"
-#define PACKAGE_STRING "Pingus 0.7.0"
+#define VERSION "0.7.1"
+#define PACKAGE_STRING "Pingus 0.7.1"
#define MAJOR_VERSION 0
#define MINOR_VERSION 7
-#define PATCH_VERSION 0
-#define VERSION_STRING "0.7.0"
+#define PATCH_VERSION 1
+#define VERSION_STRING "0.7.1"
#define PINGUS_DATADIR "data"
#define ENABLE_NLS 1
@@ -30,6 +30,7 @@
#endif
#define alloca _alloca
+#define getcwd _getcwd
// ????
#define LOCALEDIR "."
#define LOCALE_ALIAS_PATH "."
@@ -40,4 +41,6 @@
#define M_PI 3.14159265358979323846
#endif
+#define PATH_MAX _MAX_PATH
+
#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r3130 - in trunk/pingus: . src src/display src/editor src/input src/win32,
jsalmon3 <=