]> git.pld-linux.org Git - packages/pingus.git/blame - pingus-Clanlib-0.6.1.patch
projects / packages / pingus.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- acfix patch with fixes for autoconf 2.5x
[packages/pingus.git] / pingus-Clanlib-0.6.1.patch
CommitLineData
95145be6 1--- pingus-0.5.0pre3.orig/src/PinguActionFactory.cc
2+++ pingus-0.5.0pre3/src/PinguActionFactory.cc
3@@ -67,7 +67,7 @@
4 {
5 new PinguActionFactoryImpl<RocketLauncher> ("rocketlauncher");
6 new PinguActionFactoryImpl<Boarder> ("boarder");
7- new PinguActionFactoryImpl<Superman> ("");
8+ new PinguActionFactoryImpl<Superman> ("superman");
9 new PinguActionFactoryImpl<Angel> ("angel");
10 new PinguActionFactoryImpl<Basher> ("basher");
11 new PinguActionFactoryImpl<Blocker> ("blocker");
12--- pingus-0.5.0pre3.orig/src/Client.cc
13+++ pingus-0.5.0pre3/src/Client.cc
14@@ -336,8 +336,8 @@
15 //CL_Input::chain_button_press.remove(this);
16
17 // Disconnect segfaults
18- CL_Input::sig_button_press.disconnect (on_button_press_slot);
19- CL_Input::sig_button_release.disconnect (on_button_release_slot);
20+ CL_Input::sig_button_press ().disconnect (on_button_press_slot);
21+ CL_Input::sig_button_release ().disconnect (on_button_release_slot);
22
23 enabled = false;
24 }
25--- pingus-0.5.0pre3.orig/src/editor/Editor.cc
26+++ pingus-0.5.0pre3/src/editor/Editor.cc
27@@ -98,9 +98,9 @@
28 //CL_Input::chain_button_release.push_back(event);
29
30 on_button_press_slot
31- = CL_Input::sig_button_press.connect(event, &EditorEvent::on_button_press);
32+ = CL_Input::sig_button_press().connect(event, &EditorEvent::on_button_press);
33 on_button_release_slot
34- = CL_Input::sig_button_release.connect(event, &EditorEvent::on_button_release);
35+ = CL_Input::sig_button_release().connect(event, &EditorEvent::on_button_release);
36
37 if (verbose) std::cout << "done: " << event_handler_ref_counter << std::endl;
38 }
39@@ -119,8 +119,8 @@
40 //CL_Input::chain_button_release.remove(event);
41 //CL_Input::chain_button_press.remove(event);
42
43- CL_Input::sig_button_press.disconnect (on_button_press_slot);
44- CL_Input::sig_button_release.disconnect (on_button_release_slot);
45+ CL_Input::sig_button_press().disconnect (on_button_press_slot);
46+ CL_Input::sig_button_release().disconnect (on_button_release_slot);
47
48 CL_System::keep_alive();
49 if (verbose) std::cout << "done: " << event_handler_ref_counter << std::endl;
50--- pingus-0.5.0pre3.orig/src/PingusMain.cc
51+++ pingus-0.5.0pre3/src/PingusMain.cc
52@@ -803,8 +803,8 @@
53 if (print_fps)
54 Display::add_flip_screen_hook(&fps_counter);
55
56- on_button_press_slot = CL_Input::sig_button_press.connect (&global_event, &GlobalEvent::on_button_press);
57- on_button_release_slot = CL_Input::sig_button_release.connect (&global_event, &GlobalEvent::on_button_release);
58+ on_button_press_slot = CL_Input::sig_button_press ().connect (&global_event, &GlobalEvent::on_button_press);
59+ on_button_release_slot = CL_Input::sig_button_release ().connect (&global_event, &GlobalEvent::on_button_release);
60
61 //pingus_story.display ();
62
63@@ -849,8 +849,8 @@
64 PingusMessageBox(" PingusError: " + err.get_message ());
65 }
66
67- CL_Input::sig_button_press.disconnect (on_button_press_slot);
68- CL_Input::sig_button_release.disconnect(on_button_release_slot);
69+ CL_Input::sig_button_press ().disconnect (on_button_press_slot);
70+ CL_Input::sig_button_release ().disconnect(on_button_release_slot);
71 }
72
73 int
74--- pingus-0.5.0pre3.orig/src/worldmap/PingusWorldMapManager.cc
75+++ pingus-0.5.0pre3/src/worldmap/PingusWorldMapManager.cc
76@@ -49,9 +49,9 @@
77 void
78 PingusWorldMapManager::display ()
79 {
80- on_button_press_slot = CL_Input::sig_button_press.connect (this, &PingusWorldMapManager::on_button_press);
81- on_button_release_slot = CL_Input::sig_button_release.connect (this, &PingusWorldMapManager::on_button_release);
82- on_mouse_move_slot = CL_Input::sig_mouse_move.connect (this, &PingusWorldMapManager::on_mouse_move);
83+ on_button_press_slot = CL_Input::sig_button_press ().connect (this, &PingusWorldMapManager::on_button_press);
84+ on_button_release_slot = CL_Input::sig_button_release ().connect (this, &PingusWorldMapManager::on_button_release);
85+ on_mouse_move_slot = CL_Input::sig_mouse_move ().connect (this, &PingusWorldMapManager::on_mouse_move);
86
87 init ();
88
89@@ -78,9 +78,9 @@
90 Display::flip_display ();
91 }
92
93- CL_Input::sig_button_press.disconnect(on_button_press_slot);
94- CL_Input::sig_button_release.disconnect(on_button_release_slot);
95- CL_Input::sig_mouse_move.disconnect(on_mouse_move_slot);
96+ CL_Input::sig_button_press ().disconnect(on_button_press_slot);
97+ CL_Input::sig_button_release ().disconnect(on_button_release_slot);
98+ CL_Input::sig_mouse_move ().disconnect(on_mouse_move_slot);
99 }
100
101 void
102--- pingus-0.5.0pre3.orig/src/XMLhelper.hh
103+++ pingus-0.5.0pre3/src/XMLhelper.hh
104@@ -35,7 +35,7 @@
105 #include <libxml/parser.h>
106 #undef list
107 #else
108- #include <parser.h>
109+ #include <libxml/parser.h>
110 #endif
111
112 #include "ResDescriptor.hh"
113--- pingus-0.5.0pre3.orig/src/PingusMenuManager.cc
114+++ pingus-0.5.0pre3/src/PingusMenuManager.cc
115@@ -51,18 +51,18 @@
116 {
117 puts ("register_events ()");
118 ++event_register_counter;
119- on_button_press_slot = CL_Input::sig_button_press.connect (this, &PingusMenuManager::on_button_press);
120- on_button_release_slot = CL_Input::sig_button_release.connect (this, &PingusMenuManager::on_button_release);
121- on_mouse_move_slot = CL_Input::sig_mouse_move.connect (this, &PingusMenuManager::on_mouse_move);
122+ on_button_press_slot = CL_Input::sig_button_press ().connect (this, &PingusMenuManager::on_button_press);
123+ on_button_release_slot = CL_Input::sig_button_release ().connect (this, &PingusMenuManager::on_button_release);
124+ on_mouse_move_slot = CL_Input::sig_mouse_move ().connect (this, &PingusMenuManager::on_mouse_move);
125 }
126
127 /// Unregister all event-handling stuff
128 void
129 PingusMenuManager::unregister_events ()
130 {
131- CL_Input::sig_button_press.disconnect (on_button_press_slot);
132- CL_Input::sig_button_release.disconnect (on_button_release_slot);
133- CL_Input::sig_mouse_move.disconnect (on_mouse_move_slot);
134+ CL_Input::sig_button_press ().disconnect (on_button_press_slot);
135+ CL_Input::sig_button_release ().disconnect (on_button_release_slot);
136+ CL_Input::sig_mouse_move ().disconnect (on_mouse_move_slot);
137 }
138
139 void
140--- pingus-0.5.0pre3.orig/src/ThemeSelector.cc
141+++ pingus-0.5.0pre3/src/ThemeSelector.cc
142@@ -198,9 +198,9 @@
143
144 current_theme = themes.end();
145
146- on_button_press_slot = CL_Input::sig_button_press.connect (event, &ThemeSelector::Event::on_button_press);
147- on_button_release_slot = CL_Input::sig_button_release.connect (event, &ThemeSelector::Event::on_button_release);
148- on_mouse_move_slot = CL_Input::sig_mouse_move.connect (event, &ThemeSelector::Event::on_mouse_move);
149+ on_button_press_slot = CL_Input::sig_button_press ().connect (event, &ThemeSelector::Event::on_button_press);
150+ on_button_release_slot = CL_Input::sig_button_release ().connect (event, &ThemeSelector::Event::on_button_release);
151+ on_mouse_move_slot = CL_Input::sig_mouse_move ().connect (event, &ThemeSelector::Event::on_mouse_move);
152 }
153
154 ThemeSelector::~ThemeSelector()
155@@ -214,9 +214,9 @@
156 // CL_Input::chain_button_press.remove(event);
157 // CL_Input::chain_button_release.remove(event);
158
159- CL_Input::sig_button_press.disconnect (on_button_press_slot);
160- CL_Input::sig_button_release.disconnect (on_button_release_slot);
161- CL_Input::sig_mouse_move.disconnect (on_mouse_move_slot);
162+ CL_Input::sig_button_press ().disconnect (on_button_press_slot);
163+ CL_Input::sig_button_release ().disconnect (on_button_release_slot);
164+ CL_Input::sig_mouse_move ().disconnect (on_mouse_move_slot);
165
166 delete event;
167 }
168--- pingus-0.5.0pre3.orig/src/OptionMenu.cc
169+++ pingus-0.5.0pre3/src/OptionMenu.cc
170@@ -339,8 +339,8 @@
171 //CL_Input::chain_button_press.push_back(event);
172 //CL_Input::chain_button_release.push_back(event);
173
174- CL_Input::sig_button_press.connect (event, &OptionMenu::Event::on_button_press);
175- CL_Input::sig_button_release.connect (event, &OptionMenu::Event::on_button_release);
176+ CL_Input::sig_button_press ().connect (event, &OptionMenu::Event::on_button_press);
177+ CL_Input::sig_button_release ().connect (event, &OptionMenu::Event::on_button_release);
178
179 Display::set_cursor(CL_MouseCursorProvider::load("Cursors/cursor",
180 PingusResource::get("game")));
Pingus, a lemmings style game with penguins
This page took 0.05032 seconds and 4 git commands to generate.