← Back to branch summary

~ubuntu-branches/ubuntu/hardy/hedgewars/hardy

« back to all changes in this revision

Viewing changes to debian/patches/30_new_team_warnings_cmake.patch

  • Committer: Bazaar Package Importer
  • Author(s): Dmitry E. Oboukhov
  • Date: 2007-03-16 19:13:05 UTC
  • Revision ID: james.westby@ubuntu.com-20070316191305-zk148z4u3bi6176l
Tags: 0.9.0-6
http://bugs.debian.org/415606
Disable debug mode (closes: #415606).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/30_new_team_warnings_cmake.patch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 30_new_team_warnings_cmake.patch.dpatch by Igor Ulyanov <iulyanov@gmail.com>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: new team in multiplayer and net game fix - new team is now correctly
 
6
## DP: Fix most of the warnings in hwengine
 
7
## DP: Use right way of finding and using Qt4 in CMake
 
8
 
 
9
@DPATCH@
 
10
 
 
11
Index: hedgewars-0.9.0/QTfrontend/hwform.cpp
 
12
===================================================================
 
13
--- hedgewars-0.9.0/QTfrontend/hwform.cpp       (revision 506)
 
14
+++ hedgewars-0.9.0/QTfrontend/hwform.cpp       (revision 510)
 
15
@@ -156,20 +156,27 @@
 
16
        GoToPage(ID_PAGE_NET);
 
17
 }
 
18
 
 
19
-void HWForm::OnPageShown(quint8 id)
 
20
+void HWForm::OnPageShown(quint8 id, quint8 lastid)
 
21
 {
 
22
        if (id == ID_PAGE_MULTIPLAYER || id == ID_PAGE_NETCFG) {
 
23
                QStringList tmNames=config->GetTeamsList();
 
24
                TeamSelWidget* curTeamSelWidget;
 
25
-               id == ID_PAGE_MULTIPLAYER ? curTeamSelWidget=ui.pageMultiplayer->teamsSelect :
 
26
+               if(id == ID_PAGE_MULTIPLAYER) {
 
27
+                 curTeamSelWidget=ui.pageMultiplayer->teamsSelect;
 
28
+               } else {
 
29
                  curTeamSelWidget=ui.pageNetGame->pNetTeamsWidget;
 
30
+               }
 
31
                QList<HWTeam> teamsList;
 
32
                for(QStringList::iterator it=tmNames.begin(); it!=tmNames.end(); it++) {
 
33
                  HWTeam team(*it);
 
34
                  team.LoadFromFile();
 
35
                  teamsList.push_back(team);
 
36
                }
 
37
-               curTeamSelWidget->resetPlayingTeams(teamsList);
 
38
+               if(lastid==ID_PAGE_SETUP_TEAM) {
 
39
+                 if (editedTeam) curTeamSelWidget->addTeam(*editedTeam);
 
40
+               } else {
 
41
+                 curTeamSelWidget->resetPlayingTeams(teamsList);
 
42
+               }
 
43
        }
 
44
 }
 
45
 
 
46
@@ -186,7 +193,7 @@
 
47
          if(hwnet || pnetserver) NetDisconnect();
 
48
        }
 
49
        quint8 id = PagesStack.isEmpty() ? ID_PAGE_MAIN : PagesStack.pop();
 
50
-       OnPageShown(id);
 
51
+       OnPageShown(id, ui.Pages->currentIndex());
 
52
        ui.Pages->setCurrentIndex(id);
 
53
 }
 
54
 
 
55
@@ -209,14 +216,16 @@
 
56
 {
 
57
        editedTeam->GetFromPage(this);
 
58
        editedTeam->SaveToFile();
 
59
-       delete editedTeam;
 
60
        UpdateTeamsLists();
 
61
        GoBack();
 
62
+       delete editedTeam;
 
63
+       editedTeam=0;
 
64
 }
 
65
 
 
66
 void HWForm::TeamDiscard()
 
67
 {
 
68
        delete editedTeam;
 
69
+       editedTeam=0;
 
70
        GoBack();
 
71
 }
 
72
 
 
73
Index: hedgewars-0.9.0/QTfrontend/CMakeLists.txt
 
74
===================================================================
 
75
--- hedgewars-0.9.0/QTfrontend/CMakeLists.txt   (revision 506)
 
76
+++ hedgewars-0.9.0/QTfrontend/CMakeLists.txt   (revision 510)
 
77
@@ -1,8 +1,14 @@
 
78
 set(QT_MIN_VERSION "4.2.0")
 
79
 
 
80
+set(QT_USE_QTNETWORK TRUE)
 
81
+set(QT_USE_QTSVG TRUE)
 
82
+set(QT_USE_QTXML TRUE)
 
83
+set(QT_USE_QTMAIN TRUE)
 
84
+
 
85
 find_package(Qt4 REQUIRED)
 
86
+include(${QT_USE_FILE}) 
 
87
 
 
88
-include_directories(${QT_INCLUDES} .)
 
89
+include_directories(.)
 
90
 
 
91
 if(WIN32 AND NOT UNIX)
 
92
        set(HEDGEWARS_BINDIR ".")
 
93
@@ -99,26 +105,18 @@
 
94
        ${hwfr_moc_srcs}
 
95
        ${hwfr_hdrs}
 
96
        ${hwfr_rez_src})
 
97
+       
 
98
+set(HW_LINK_LIBS ${QT_LIBRARIES})
 
99
 
 
100
+if(WIN32 AND NOT UNIX)
 
101
+       set(HW_LINK_LIBS 
 
102
+               ${HW_LINK_LIBS}
 
103
+               ole32
 
104
+               winspool
 
105
+               uuid)
 
106
+endif(WIN32 AND NOT UNIX)
 
107
+
 
108
 target_link_libraries(hedgewars 
 
109
-       ${QT_QTCORE_LIBRARY}
 
110
-       ${QT_QTGUI_LIBRARY}
 
111
-       ${QT_QTNETWORK_LIBRARY}
 
112
-       ${QT_QTSVG_LIBRARY}
 
113
-       ${QT_QTMAIN_LIBRARY})
 
114
+       ${HW_LINK_LIBS})
 
115
 
 
116
 install(PROGRAMS "${EXECUTABLE_OUTPUT_PATH}/hedgewars${CMAKE_EXECUTABLE_SUFFIX}" DESTINATION bin)
 
117
-
 
118
-
 
119
-if(WIN32 AND NOT UNIX)
 
120
-       string(REPLACE "\\" "/" QT_BIN_DIR $ENV{QTDIR}/bin)
 
121
-
 
122
-       install(FILES
 
123
-               "${QT_BIN_DIR}/QtNetwork4.dll"
 
124
-               "${QT_BIN_DIR}/QtGui4.dll"
 
125
-               "${QT_BIN_DIR}/QtCore4.dll"
 
126
-               "${QT_BIN_DIR}/QtSvg4.dll"
 
127
-               "${QT_BIN_DIR}/QtXml4.dll"
 
128
-               "${QT_BIN_DIR}/mingwm10.dll"
 
129
-               DESTINATION bin)
 
130
-endif(WIN32 AND NOT UNIX)
 
131
Index: hedgewars-0.9.0/QTfrontend/hwform.h
 
132
===================================================================
 
133
--- hedgewars-0.9.0/QTfrontend/hwform.h (revision 506)
 
134
+++ hedgewars-0.9.0/QTfrontend/hwform.h (revision 510)
 
135
@@ -94,7 +94,7 @@
 
136
        HWNetServer* pnetserver;
 
137
        HWNetUdpServer* pUdpServer;
 
138
        void AddStatText(const QString & msg);
 
139
-       void OnPageShown(quint8 id);
 
140
+       void OnPageShown(quint8 id, quint8 lastid=0);
 
141
 };
 
142
 
 
143
 #endif
 
144
Index: hedgewars-0.9.0/hedgewars/uLand.pas
 
145
===================================================================
 
146
--- hedgewars-0.9.0/hedgewars/uLand.pas (revision 506)
 
147
+++ hedgewars-0.9.0/hedgewars/uLand.pas (revision 510)
 
148
@@ -212,7 +212,7 @@
 
149
 end;
 
150
 
 
151
 procedure BezierizeEdge(var pa: TPixAr; Delta: hwFloat);
 
152
-var x, y, i, StartLoop: LongInt;
 
153
+var i, StartLoop: LongInt;
 
154
     opa: TPixAr;
 
155
 begin
 
156
 opa:= pa;
 
157
Index: hedgewars-0.9.0/hedgewars/uMisc.pas
 
158
===================================================================
 
159
--- hedgewars-0.9.0/hedgewars/uMisc.pas (revision 506)
 
160
+++ hedgewars-0.9.0/hedgewars/uMisc.pas (revision 510)
 
161
@@ -167,16 +167,6 @@
 
162
 FloatToStr:= cstr(n)
 
163
 end;
 
164
 
 
165
-{$IFNDEF FPC}
 
166
-function arctan2(const Y, X: hwFloat): hwFloat;
 
167
-asm
 
168
-        fld     Y
 
169
-        fld     X
 
170
-        fpatan
 
171
-        fwait
 
172
-end;
 
173
-{$ENDIF}
 
174
-
 
175
 function DxDy2Angle32(const _dY, _dX: hwFloat): LongInt;
 
176
 const _16divPI: Extended = 16/pi;
 
177
 var dY, dX: Extended;
 
178
Index: hedgewars-0.9.0/hedgewars/GSHandlers.inc
 
179
===================================================================
 
180
--- hedgewars-0.9.0/hedgewars/GSHandlers.inc    (revision 506)
 
181
+++ hedgewars-0.9.0/hedgewars/GSHandlers.inc    (revision 510)
 
182
@@ -1035,7 +1035,6 @@
 
183
 end;
 
184
 
 
185
 procedure doStepAirAttack(Gear: PGear);
 
186
-var t: LongInt;
 
187
 begin
 
188
 AllInactive:= false;
 
189
 if Gear^.X.QWordValue = 0 then Gear^.Tag:=  1
 
190
Index: hedgewars-0.9.0/hedgewars/options.inc
 
191
===================================================================
 
192
--- hedgewars-0.9.0/hedgewars/options.inc       (revision 506)
 
193
+++ hedgewars-0.9.0/hedgewars/options.inc       (revision 510)
 
194
@@ -18,7 +18,7 @@
 
195
 
 
196
 {$J+}
 
197
 
 
198
-{ $DEFINE DEBUGFILE}
 
199
+(* { $DEFINE DEBUGFILE} *)
 
200
 { $DEFINE COUNTTICKS}
 
201
 { $DEFINE DUMP}
 
202
 { $DEFINE TRACEAIACTIONS}
 
203
Index: hedgewars-0.9.0/hedgewars/uLandGraphics.pas
 
204
===================================================================
 
205
--- hedgewars-0.9.0/hedgewars/uLandGraphics.pas (revision 506)
 
206
+++ hedgewars-0.9.0/hedgewars/uLandGraphics.pas (revision 510)
 
207
@@ -269,13 +269,11 @@
 
208
 end;
 
209
 
 
210
 function TryPlaceOnLand(cpX, cpY: LongInt; Obj: TSprite; Frame: LongInt): boolean;
 
211
-var Result: boolean;
 
212
-    X, Y, sY, bpp, h, w: LongInt;
 
213
+var X, Y, bpp, h, w: LongInt;
 
214
     p: PByteArray;
 
215
     r, rr: TSDL_Rect;
 
216
     Image: PSDL_Surface;
 
217
 begin
 
218
-Result:= true;
 
219
 Image:= SpritesData[Obj].Surface;
 
220
 w:= SpritesData[Obj].Width;
 
221
 h:= SpritesData[Obj].Height; 
 
222
Index: hedgewars-0.9.0/hedgewars/uConsts.pas
 
223
===================================================================
 
224
--- hedgewars-0.9.0/hedgewars/uConsts.pas       (revision 506)
 
225
+++ hedgewars-0.9.0/hedgewars/uConsts.pas       (revision 510)
 
226
@@ -357,7 +357,8 @@
 
227
                                    TimeAfterTurn: 3000;
 
228
                                    minAngle: 0;
 
229
                                    maxAngle: 0;
 
230
-                                   PosCount: 1),
 
231
+                                   PosCount: 1;
 
232
+                                   PosSprite: sprWater),
 
233
                                   (NameId: sidClusterBomb;
 
234
                                    Probability: 100;
 
235
                                    NumberInCase: 3;
 
236
@@ -372,7 +373,8 @@
 
237
                                    TimeAfterTurn: 3000;
 
238
                                    minAngle: 0;
 
239
                                    maxAngle: 0;
 
240
-                                   PosCount: 1),
 
241
+                                   PosCount: 1;
 
242
+                                   PosSprite: sprWater),
 
243
                                   (NameId: sidBazooka;
 
244
                                    Probability: 0;
 
245
                                    NumberInCase: 1;
 
246
@@ -386,7 +388,8 @@
 
247
                                    TimeAfterTurn: 3000;
 
248
                                    minAngle: 0;
 
249
                                    maxAngle: 0;
 
250
-                                   PosCount: 1),
 
251
+                                   PosCount: 1;
 
252
+                                   PosSprite: sprWater),
 
253
                                   (NameId: sidUFO;
 
254
                                    Probability: 100;
 
255
                                    NumberInCase: 1;
 
256
@@ -401,7 +404,8 @@
 
257
                                    TimeAfterTurn: 3000;
 
258
                                    minAngle: 0;
 
259
                                    maxAngle: 0;
 
260
-                                   PosCount: 1),
 
261
+                                   PosCount: 1;
 
262
+                                   PosSprite: sprWater),
 
263
                                   (NameId: sidShotgun;
 
264
                                    Probability: 0;
 
265
                                    NumberInCase: 1;
 
266
@@ -415,7 +419,8 @@
 
267
                                    TimeAfterTurn: 3000;
 
268
                                    minAngle: 0;
 
269
                                    maxAngle: 0;
 
270
-                                   PosCount: 1),
 
271
+                                   PosCount: 1;
 
272
+                                   PosSprite: sprWater),
 
273
                                   (NameId: sidPickHammer;
 
274
                                    Probability: 0;
 
275
                                    NumberInCase: 1;
 
276
@@ -432,7 +437,8 @@
 
277
                                    TimeAfterTurn: 0;
 
278
                                    minAngle: 0;
 
279
                                    maxAngle: 0;
 
280
-                                   PosCount: 1),
 
281
+                                   PosCount: 1;
 
282
+                                   PosSprite: sprWater),
 
283
                                   (NameId: sidSkip;
 
284
                                    Probability: 0;
 
285
                                    NumberInCase: 1;
 
286
@@ -446,7 +452,8 @@
 
287
                                    TimeAfterTurn: 0;
 
288
                                    minAngle: 0;
 
289
                                    maxAngle: 0;
 
290
-                                   PosCount: 1),
 
291
+                                   PosCount: 1;
 
292
+                                   PosSprite: sprWater),
 
293
                                   (NameId: sidRope;
 
294
                                    Probability: 100;
 
295
                                    NumberInCase: 3;
 
296
@@ -462,7 +469,8 @@
 
297
                                    TimeAfterTurn: 0;
 
298
                                    minAngle: 0;
 
299
                                    maxAngle: cMaxAngle div 2;
 
300
-                                   PosCount: 1),
 
301
+                                   PosCount: 1;
 
302
+                                   PosSprite: sprWater),
 
303
                                   (NameId: sidMine;
 
304
                                    Probability: 100;
 
305
                                    NumberInCase: 1;
 
306
@@ -476,7 +484,8 @@
 
307
                                    TimeAfterTurn: 5000;
 
308
                                    minAngle: 0;
 
309
                                    maxAngle: 0;
 
310
-                                   PosCount: 1),
 
311
+                                   PosCount: 1;
 
312
+                                   PosSprite: sprWater),
 
313
                                   (NameId: sidDEagle;
 
314
                                    Probability: 100;
 
315
                                    NumberInCase: 2;
 
316
@@ -490,7 +499,8 @@
 
317
                                    TimeAfterTurn: 3000;
 
318
                                    minAngle: 0;
 
319
                                    maxAngle: 0;
 
320
-                                   PosCount: 1),
 
321
+                                   PosCount: 1;
 
322
+                                   PosSprite: sprWater),
 
323
                                   (NameId: sidDynamite;
 
324
                                    Probability: 100;
 
325
                                    NumberInCase: 1;
 
326
@@ -506,7 +516,8 @@
 
327
                                    TimeAfterTurn: 5000;
 
328
                                    minAngle: 0;
 
329
                                    maxAngle: 0;
 
330
-                                   PosCount: 1),
 
331
+                                   PosCount: 1;
 
332
+                                   PosSprite: sprWater),
 
333
                                   (NameId: sidFirePunch;
 
334
                                    Probability: 0;
 
335
                                    NumberInCase: 1;
 
336
@@ -523,7 +534,8 @@
 
337
                                    TimeAfterTurn: 3000;
 
338
                                    MinAngle: 0;
 
339
                                    maxAngle: 0;
 
340
-                                   PosCount: 1),
 
341
+                                   PosCount: 1;
 
342
+                                   PosSprite: sprWater),
 
343
                                   (NameId: sidBaseballBat;
 
344
                                    Probability: 100;
 
345
                                    NumberInCase: 1;
 
346
@@ -537,7 +549,8 @@
 
347
                                    TimeAfterTurn: 5000;
 
348
                                    minAngle: 0;
 
349
                                    maxAngle: cMaxAngle div 2;
 
350
-                                   PosCount: 1),
 
351
+                                   PosCount: 1;
 
352
+                                   PosSprite: sprWater),
 
353
                                   (NameId: sidParachute;
 
354
                                    Probability: 100;
 
355
                                    NumberInCase: 1;
 
356
@@ -554,7 +567,8 @@
 
357
                                    TimeAfterTurn: 0;
 
358
                                    minAngle: 0;
 
359
                                    maxAngle: 0;
 
360
-                                   PosCount: 1),
 
361
+                                   PosCount: 1;
 
362
+                                   PosSprite: sprWater),
 
363
                                   (NameId: sidAirAttack;
 
364
                                    Probability: 100;
 
365
                                    NumberInCase: 1;
 
366
@@ -602,7 +616,8 @@
 
367
                                    TimeAfterTurn: 3000;
 
368
                                    minAngle: 768;
 
369
                                    maxAngle: 1280;
 
370
-                                   PosCount: 1),
 
371
+                                   PosCount: 1;
 
372
+                                   PosSprite: sprWater),
 
373
                                   (NameId: sidGirder;
 
374
                                    Probability: 400;
 
375
                                    NumberInCase: 3;
 
376
Index: hedgewars-0.9.0/hedgewars/uStore.pas
 
377
===================================================================
 
378
--- hedgewars-0.9.0/hedgewars/uStore.pas        (revision 506)
 
379
+++ hedgewars-0.9.0/hedgewars/uStore.pas        (revision 510)
 
380
@@ -248,6 +248,7 @@
 
381
     TryDo(IOResult = 0, msgFailed, true);
 
382
     WriteLnToConsole(msgOK);
 
383
     val(s, cExplosionBorderColor, c);
 
384
+    TryDo(c = 0, 'Theme data corrupted', true);
 
385
     AdjustColor(cExplosionBorderColor);
 
386
     end;
 
387
 
 
388
Index: hedgewars-0.9.0/hedgewars/uGears.pas
 
389
===================================================================
 
390
--- hedgewars-0.9.0/hedgewars/uGears.pas        (revision 506)
 
391
+++ hedgewars-0.9.0/hedgewars/uGears.pas        (revision 510)
 
392
@@ -842,7 +842,7 @@
 
393
     CountNonZeroz:= Result
 
394
     end;
 
395
 
 
396
-var fx, x: LongInt;
 
397
+var x: LongInt;
 
398
     y, sy: LongInt;
 
399
     ar: array[0..511] of TPoint;
 
400
     ar2: array[0..1023] of TPoint;
 
401
Index: hedgewars-0.9.0/hedgewars/uConsole.pas
 
402
===================================================================
 
403
--- hedgewars-0.9.0/hedgewars/uConsole.pas      (revision 506)
 
404
+++ hedgewars-0.9.0/hedgewars/uConsole.pas      (revision 510)
 
405
@@ -156,7 +156,7 @@
 
406
 
 
407
 procedure ParseCommand(CmdStr: shortstring; TrustedSource: boolean);
 
408
 type PhwFloat = ^hwFloat;
 
409
-var i, ii: LongInt;
 
410
+var ii: LongInt;
 
411
     s: shortstring;
 
412
     t: PVariable;
 
413
     c: char;
 
414
@@ -183,8 +183,8 @@
 
415
                             begin
 
416
                             str(PLongInt(t^.Handler)^, s);
 
417
                             WriteLnToConsole('$' + CmdStr + ' is "' + s + '"');
 
418
-                            end else val(s, PLongInt(t^.Handler)^, i);
 
419
-                 vthwFloat: if c='$' then
 
420
+                            end else val(s, PLongInt(t^.Handler)^);
 
421
+              vthwFloat: if c='$' then
 
422
                          if s[0]=#0 then
 
423
                             begin
 
424
                             //str(PhwFloat(t^.Handler)^:4:6, s);
 
425
@@ -197,7 +197,7 @@
 
426
                             WriteLnToConsole('$' + CmdStr + ' is "' + s + '"');
 
427
                             end else
 
428
                             begin
 
429
-                            val(s, ii, i);
 
430
+                            val(s, ii);
 
431
                             boolean(t^.Handler^):= not (ii = 0)
 
432
                             end;
 
433
               end;
 
434
Index: hedgewars-0.9.0/hedgewars/CCHandlers.inc
 
435
===================================================================
 
436
--- hedgewars-0.9.0/hedgewars/CCHandlers.inc    (revision 506)
 
437
+++ hedgewars-0.9.0/hedgewars/CCHandlers.inc    (revision 510)
 
438
@@ -99,27 +99,25 @@
 
439
 end;
 
440
 
 
441
 procedure chColor(var id: shortstring);
 
442
-var c: LongInt;
 
443
 begin
 
444
 if CurrentTeam = nil then OutError(errmsgIncorrectUse + ' "/color"', true);
 
445
-val(id, CurrentTeam^.Color, c);
 
446
+val(id, CurrentTeam^.Color);
 
447
 CurrentTeam^.AdjColor:= CurrentTeam^.Color;
 
448
 AdjustColor(CurrentTeam^.AdjColor)
 
449
 end;
 
450
 
 
451
 procedure chAddHH(var id: shortstring);
 
452
 var s: shortstring;
 
453
-    c: LongInt;
 
454
     Gear: PGear;
 
455
 begin
 
456
 if (not isDeveloperMode) or (CurrentTeam = nil) then exit;
 
457
 with CurrentTeam^ do
 
458
      begin
 
459
      SplitBySpace(id, s);
 
460
-     val(id, Hedgehogs[HedgehogsNumber].BotLevel, c);
 
461
+     val(id, Hedgehogs[HedgehogsNumber].BotLevel);
 
462
      Gear:= AddGear(0, 0, gtHedgehog, 0, 0, 0, 0);
 
463
      Gear^.Hedgehog:= @Hedgehogs[HedgehogsNumber];
 
464
-     val(s, Gear^.Health, c);
 
465
+     val(s, Gear^.Health);
 
466
      TryDo(Gear^.Health > 0, 'Invalid hedgehog health', true);
 
467
      PHedgehog(Gear^.Hedgehog)^.Team:= CurrentTeam;
 
468
      Hedgehogs[HedgehogsNumber].AmmoStore:= TeamsCount - 1;