You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
154 lines
6.6 KiB
154 lines
6.6 KiB
18 years ago
|
# --- T2-COPYRIGHT-NOTE-BEGIN ---
|
||
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||
|
|
#
|
||
|
|
# T2 SDE: package/.../pingus/gcc4.patch
|
||
|
|
# Copyright (C) 2006 The T2 SDE Project
|
||
|
|
#
|
||
|
|
# More information can be found in the files COPYING and README.
|
||
|
|
#
|
||
|
|
# This patch file is dual-licensed. It is available under the license the
|
||
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
||
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||
|
|
# of the GNU General Public License as published by the Free Software
|
||
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
||
|
|
# version.
|
||
|
|
# --- T2-COPYRIGHT-NOTE-END ---
|
||
|
|
|
||
|
|
diff -Nur pingus-0.6.0-orig/src/blitter.cxx pingus-0.6.0/src/blitter.cxx
|
||
|
|
--- pingus-0.6.0-orig/src/blitter.cxx 2003-04-09 20:22:59.000000000 +0000
|
||
|
|
+++ pingus-0.6.0/src/blitter.cxx 2006-01-25 23:01:12.081946750 +0000
|
||
|
|
@@ -17,6 +17,7 @@
|
||
|
|
// along with this program; if not, write to the Free Software
|
||
|
|
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||
|
|
|
||
|
|
+#include <assert.h>
|
||
|
|
#include <config.h>
|
||
|
|
#include <stdio.h>
|
||
|
|
#include "pingus_error.hxx"
|
||
|
|
diff -Nur pingus-0.6.0-orig/src/col_map.cxx pingus-0.6.0/src/col_map.cxx
|
||
|
|
--- pingus-0.6.0-orig/src/col_map.cxx 2003-02-19 09:50:35.000000000 +0000
|
||
|
|
+++ pingus-0.6.0/src/col_map.cxx 2006-01-25 23:01:39.979690250 +0000
|
||
|
|
@@ -17,6 +17,7 @@
|
||
|
|
// along with this program; if not, write to the Free Software
|
||
|
|
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||
|
|
|
||
|
|
+#include <assert.h>
|
||
|
|
#include <iostream>
|
||
|
|
#include <ClanLib/Display/SurfaceProviders/canvas.h>
|
||
|
|
#include "gui/graphic_context.hxx"
|
||
|
|
diff -Nur pingus-0.6.0-orig/src/console.cxx pingus-0.6.0/src/console.cxx
|
||
|
|
--- pingus-0.6.0-orig/src/console.cxx 2003-01-02 20:49:55.000000000 +0000
|
||
|
|
+++ pingus-0.6.0/src/console.cxx 2006-01-25 23:02:05.289272000 +0000
|
||
|
|
@@ -17,6 +17,7 @@
|
||
|
|
// along with this program; if not, write to the Free Software
|
||
|
|
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||
|
|
|
||
|
|
+#include <assert.h>
|
||
|
|
#include <config.h>
|
||
|
|
#include <ClanLib/Display/Display/display.h>
|
||
|
|
#include <ClanLib/Display/Font/font.h>
|
||
|
|
diff -Nur pingus-0.6.0-orig/src/demo_recorder.cxx pingus-0.6.0/src/demo_recorder.cxx
|
||
|
|
--- pingus-0.6.0-orig/src/demo_recorder.cxx 2003-04-04 11:23:27.000000000 +0000
|
||
|
|
+++ pingus-0.6.0/src/demo_recorder.cxx 2006-01-25 23:02:29.986815500 +0000
|
||
|
|
@@ -17,6 +17,7 @@
|
||
|
|
// along with this program; if not, write to the Free Software
|
||
|
|
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||
|
|
|
||
|
|
+#include <assert.h>
|
||
|
|
#include <time.h>
|
||
|
|
#include <iostream>
|
||
|
|
#include "system.hxx"
|
||
|
|
diff -Nur pingus-0.6.0-orig/src/editor/generic_property_frame.cxx pingus-0.6.0/src/editor/generic_property_frame.cxx
|
||
|
|
--- pingus-0.6.0-orig/src/editor/generic_property_frame.cxx 2003-03-25 23:15:23.000000000 +0000
|
||
|
|
+++ pingus-0.6.0/src/editor/generic_property_frame.cxx 2006-01-25 23:03:08.805241500 +0000
|
||
|
|
@@ -17,6 +17,7 @@
|
||
|
|
// along with this program; if not, write to the Free Software
|
||
|
|
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||
|
|
|
||
|
|
+#include <assert.h>
|
||
|
|
#include <iostream>
|
||
|
|
#include <ClanLib/GUI/label.h>
|
||
|
|
#include <ClanLib/GUI/inputbox.h>
|
||
|
|
diff -Nur pingus-0.6.0-orig/src/gui/root_gui_manager.cxx pingus-0.6.0/src/gui/root_gui_manager.cxx
|
||
|
|
--- pingus-0.6.0-orig/src/gui/root_gui_manager.cxx 2002-09-25 10:16:17.000000000 +0000
|
||
|
|
+++ pingus-0.6.0/src/gui/root_gui_manager.cxx 2006-01-25 23:03:31.422655000 +0000
|
||
|
|
@@ -17,6 +17,7 @@
|
||
|
|
// along with this program; if not, write to the Free Software
|
||
|
|
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||
|
|
|
||
|
|
+#include <assert.h>
|
||
|
|
#include "root_gui_manager.hxx"
|
||
|
|
#include "../input/controller.hxx"
|
||
|
|
|
||
|
|
diff -Nur pingus-0.6.0-orig/src/pingu_holder.cxx pingus-0.6.0/src/pingu_holder.cxx
|
||
|
|
--- pingus-0.6.0-orig/src/pingu_holder.cxx 2003-03-25 00:37:44.000000000 +0000
|
||
|
|
+++ pingus-0.6.0/src/pingu_holder.cxx 2006-01-25 23:04:21.497784500 +0000
|
||
|
|
@@ -17,6 +17,7 @@
|
||
|
|
// along with this program; if not, write to the Free Software
|
||
|
|
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||
|
|
|
||
|
|
+#include <assert.h>
|
||
|
|
#include <iostream>
|
||
|
|
#include "pingu_holder.hxx"
|
||
|
|
#include "pingu.hxx"
|
||
|
|
diff -Nur pingus-0.6.0-orig/src/savegame_manager.cxx pingus-0.6.0/src/savegame_manager.cxx
|
||
|
|
--- pingus-0.6.0-orig/src/savegame_manager.cxx 2003-04-11 12:45:39.000000000 +0000
|
||
|
|
+++ pingus-0.6.0/src/savegame_manager.cxx 2006-01-25 23:04:42.583102250 +0000
|
||
|
|
@@ -17,6 +17,7 @@
|
||
|
|
// along with this program; if not, write to the Free Software
|
||
|
|
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||
|
|
|
||
|
|
+#include <assert.h>
|
||
|
|
#include <iostream>
|
||
|
|
#include <fstream>
|
||
|
|
#include "system.hxx"
|
||
|
|
diff -Nur pingus-0.6.0-orig/src/story_screen.cxx pingus-0.6.0/src/story_screen.cxx
|
||
|
|
--- pingus-0.6.0-orig/src/story_screen.cxx 2003-04-15 23:12:29.000000000 +0000
|
||
|
|
+++ pingus-0.6.0/src/story_screen.cxx 2006-01-25 23:00:49.428531000 +0000
|
||
|
|
@@ -142,7 +142,7 @@
|
||
|
|
|
||
|
|
if (!page_displayed_completly)
|
||
|
|
{
|
||
|
|
- unsigned int len = static_cast<unsigned int>(20.0f * time_passed);
|
||
|
|
+ size_t len = static_cast<unsigned int>(20.0f * time_passed);
|
||
|
|
display_text = current_page.text.substr(0, Math::min(current_page.text.length(), len));
|
||
|
|
|
||
|
|
if (current_page.text.length() < len)
|
||
|
|
diff -Nur pingus-0.6.0-orig/src/worldmap/dot.cxx pingus-0.6.0/src/worldmap/dot.cxx
|
||
|
|
--- pingus-0.6.0-orig/src/worldmap/dot.cxx 2003-02-18 11:28:41.000000000 +0000
|
||
|
|
+++ pingus-0.6.0/src/worldmap/dot.cxx 2006-01-25 23:05:04.748487500 +0000
|
||
|
|
@@ -17,6 +17,7 @@
|
||
|
|
// along with this program; if not, write to the Free Software
|
||
|
|
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||
|
|
|
||
|
|
+#include <assert.h>
|
||
|
|
#include <iostream>
|
||
|
|
#include "../xml_file_reader.hxx"
|
||
|
|
#include "dot.hxx"
|
||
|
|
diff -Nur pingus-0.6.0-orig/src/worldmap/graph.hxx pingus-0.6.0/src/worldmap/graph.hxx
|
||
|
|
--- pingus-0.6.0-orig/src/worldmap/graph.hxx 2002-10-22 00:20:42.000000000 +0000
|
||
|
|
+++ pingus-0.6.0/src/worldmap/graph.hxx 2006-01-25 23:06:27.597665250 +0000
|
||
|
|
@@ -20,8 +20,10 @@
|
||
|
|
#ifndef HEADER_GRAPH_HXX
|
||
|
|
#define HEADER_GRAPH_HXX
|
||
|
|
|
||
|
|
+#include <assert.h>
|
||
|
|
#include <algorithm>
|
||
|
|
#include <vector>
|
||
|
|
+#include <iostream.h>
|
||
|
|
|
||
|
|
namespace WorldMapNS {
|
||
|
|
|
||
|
|
diff -Nur pingus-0.6.0-orig/src/worldmap/sprite_drawable.hxx pingus-0.6.0/src/worldmap/sprite_drawable.hxx
|
||
|
|
--- pingus-0.6.0-orig/src/worldmap/sprite_drawable.hxx 2003-04-10 11:51:32.000000000 +0000
|
||
|
|
+++ pingus-0.6.0/src/worldmap/sprite_drawable.hxx 2006-01-25 23:07:06.552099750 +0000
|
||
|
|
@@ -46,7 +46,7 @@
|
||
|
|
|
||
|
|
private:
|
||
|
|
SpriteDrawable (const SpriteDrawable&);
|
||
|
|
- SpriteDrawable operator= (const SpriteDrawable&);
|
||
|
|
+ SpriteDrawable& operator= (const SpriteDrawable&);
|
||
|
|
};
|
||
|
|
|
||
|
|
} // namespace WorldMapNS
|