Mercurial Mercurial > sheepy-clone / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Bind also 9th slot
authorunc0rr
Thu, 08 Feb 2007 16:29:33 +0000
changeset 415 d6d3a6a473a3
parent 414 52e6be3a0985
child 416 595d8663254d
- Bind also 9th slot - Set svn:eol-style to native - Console hides on ` key press in russian locale - Fix construction tool number not decreasing after use
QTfrontend/binds.h file | annotate | diff | comparison | revisions
hedgewars/GSHandlers.inc file | annotate | diff | comparison | revisions
hedgewars/hwengine.dpr file | annotate | diff | comparison | revisions
hedgewars/uConsole.pas file | annotate | diff | comparison | revisions 
--- a/QTfrontend/binds.h	Wed Feb 07 23:01:32 2007 +0000
+++ b/QTfrontend/binds.h	Thu Feb 08 16:29:33 2007 +0000
@@ -22,7 +22,7 @@
 #include <QString>
 #include <QtGlobal>
 
-#define BINDS_NUMBER 30
+#define BINDS_NUMBER 31
 
 struct BindAction
 {
@@ -52,7 +52,8 @@
 	{"slot 5",	"f5",	QT_TRANSLATE_NOOP("binds", "slot 5"),	false},
 	{"slot 6",	"f6",	QT_TRANSLATE_NOOP("binds", "slot 6"),	false},
 	{"slot 7",	"f7",	QT_TRANSLATE_NOOP("binds", "slot 7"),	false},
-	{"slot 8",	"f8",	QT_TRANSLATE_NOOP("binds", "slot 8"),	true},
+	{"slot 8",	"f8",	QT_TRANSLATE_NOOP("binds", "slot 8"),	false},
+	{"slot 9",	"f9",	QT_TRANSLATE_NOOP("binds", "slot 9"),	true},
 	{"timer 1",	"1",	QT_TRANSLATE_NOOP("binds", "timer 1 sec"),	false},
 	{"timer 2",	"2",	QT_TRANSLATE_NOOP("binds", "timer 2 sec"),	false},
 	{"timer 3",	"3",	QT_TRANSLATE_NOOP("binds", "timer 3 sec"),	false},
--- a/hedgewars/GSHandlers.inc	Wed Feb 07 23:01:32 2007 +0000
+++ b/hedgewars/GSHandlers.inc	Thu Feb 08 16:29:33 2007 +0000
@@ -1063,21 +1063,24 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 procedure doStepGirder(Gear: PGear);
+var HHGear: PGear;
 begin
 AllInactive:= false;
-writelntoconsole(inttostr(TargetPoint.X));
+
+HHGear:= PHedgehog(Gear^.Hedgehog)^.Gear;
 if not TryPlaceOnLand(TargetPoint.X - SpritesData[sprAmGirder].Width div 2,
                       TargetPoint.Y - SpritesData[sprAmGirder].Height div 2,
                       sprAmGirder, Gear^.State) then
-   with PHedgehog(Gear^.Hedgehog)^.Gear^ do
         begin
-        State:= State and not gstAttacking;
-        Message:= Message and not gm_Attack;
-        isCursorVisible:= true;
-        with PHedgehog(Gear^.Hedgehog)^ do
-             State:= State or gstHHChooseTarget
+        HHGear^.Message:= HHGear^.Message and not gm_Attack;
+        HHGear^.State:= HHGear^.State and not gstAttacking;
+        HHGear^.State:= HHGear^.State or gstHHChooseTarget;
+        DeleteGear(Gear);
+        isCursorVisible:= true
         end
-   else AfterAttack;
-TargetPoint.X:= NoPointX;
-DeleteGear(Gear)
+   else begin
+        DeleteGear(Gear);
+        AfterAttack
+        end;
+TargetPoint.X:= NoPointX
 end;
--- a/hedgewars/hwengine.dpr	Wed Feb 07 23:01:32 2007 +0000
+++ b/hedgewars/hwengine.dpr	Thu Feb 08 16:29:33 2007 +0000
@@ -140,7 +140,12 @@
                                         cConsoleYAdd:= cConsoleHeight;
                                         GameState:= gsConsole
                                         end;
-                          gsConsole: KeyPressConsole(event.key.keysym.unicode);
+                          gsConsole: if event.key.keysym.sym = 96 then
+                                        begin
+                                        GameState:= gsGame;
+                                        cConsoleYAdd:= 0;
+                                        ResetKbd
+                                        end else KeyPressConsole(event.key.keysym.unicode);
                              end;
            SDL_ACTIVEEVENT: if (event.active.state and SDL_APPINPUTFOCUS) <> 0 then
                                cHasFocus:= event.active.gain = 1;
--- a/hedgewars/uConsole.pas	Wed Feb 07 23:01:32 2007 +0000
+++ b/hedgewars/uConsole.pas	Thu Feb 08 16:29:33 2007 +0000
@@ -248,12 +248,7 @@
          else
             ParseCommand('/say ' + InputStr, false);
          InputStr:= ''
-         end;
-     96: begin
-         GameState:= gsGame;
-         cConsoleYAdd:= 0;
-         ResetKbd
-         end;
+         end
      else
      if (Key < $80) then btw:= 1
      else if (Key < $800) then btw:= 2
sheepy-clone