Engine:
authormario.liebisch
Wed, 16 Jun 2010 11:50:45 +0200
changeset 3505 ada9f697eb11
parent 3504 6a28efdec1f5
child 3506 0523e68f1972
Engine: * Bomb clusters now inherit 20 % of their parent's horizontal velocity (makes it a little bit more realistic without completely changing gameplay IMO - needs testing) Mercurial: * Added EOL rules (requires plugin to be activated) and ignore list
.hgeol
.hgignore
hedgewars/GSHandlers.inc
misc/openalbridge/openalbridge_t.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgeol	Wed Jun 16 11:50:45 2010 +0200
@@ -0,0 +1,8 @@
+[patterns]
+**.h = native
+**.c = native
+**.cpp = native
+**.lua = native
+**.txt = native
+**.pas = native
+**.inc = native
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Wed Jun 16 11:50:45 2010 +0200
@@ -0,0 +1,24 @@
+glob:CMakeCache.txt
+glob:CMakeFiles
+glob:*.orig
+glob:*.cmake
+glob:Makefile
+glob:*.bak
+glob:*.o
+glob:moc_*.*
+glob:*.ppu
+glob:*.dll
+glob:*.exe
+glob:*.or
+glob:*.a
+glob:*.cmd
+glob:*.hi
+glob:*.res
+glob:*.diff
+glob:hedgewars/config.inc
+glob:*.patch
+glob:*.cxx
+glob:*.log
+glob:QTfrontend/hwconsts.cpp
+glob:checkstack.*
+glob:install_manifest.txt
--- a/hedgewars/GSHandlers.inc	Wed Jun 16 04:10:50 2010 +0000
+++ b/hedgewars/GSHandlers.inc	Wed Jun 16 11:50:45 2010 +0200
@@ -324,7 +324,7 @@
                     doMakeExplosion(x, y, 20, EXPLAutoSound);
                     for i:= 0 to 4 do
                         begin
-                        dX := rndSign(GetRandom * _0_1);
+                        dX := rndSign(GetRandom * _0_1) + Gear^.dX / 5;
                         dY := (GetRandom - _3) * _0_08;
                         AddGear(x, y, gtCluster, 0, dX, dY, 25);
                         end
@@ -336,7 +336,7 @@
                 doMakeExplosion(x, y, 75, EXPLAutoSound);
                 for i:= 0 to 5 do
                     begin
-                    dX := rndSign(GetRandom * _0_1);
+                    dX := rndSign(GetRandom * _0_1) + Gear^.dX / 5;
                     dY := (GetRandom - _1_5) * _0_3;
                     AddGear(x, y, gtMelonPiece, 0, dX, dY, 75)^.DirAngle := i * 60;
                     end
--- a/misc/openalbridge/openalbridge_t.h	Wed Jun 16 04:10:50 2010 +0000
+++ b/misc/openalbridge/openalbridge_t.h	Wed Jun 16 11:50:45 2010 +0200
@@ -1,61 +1,61 @@
-/*
- * OpenAL Bridge - a simple portable library for OpenAL interface
- * Copyright (c) 2009 Vittorio Giovara <vittorio.giovara@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <stdint.h>
-
-#ifndef _OALB_INTERFACE_TYPES_H
-#define _OALB_INTERFACE_TYPES_H
-
-enum al_fade_enum {AL_FADE_IN, AL_FADE_OUT};
-typedef enum al_fade_enum al_fade_t;
-
-//data type for passing data between threads
-#pragma pack(1)
-typedef struct _fade_t {
-    uint32_t index;
-    uint16_t quantity;
-    al_fade_t type;
-} fade_t;
-#pragma pack()
-
-
-//data type for WAV header
-#pragma pack(1)
-typedef struct _WAV_header_t {
-    uint32_t ChunkID;
-    uint32_t ChunkSize;
-    uint32_t Format;
-    uint32_t Subchunk1ID;
-    uint32_t Subchunk1Size;
-    uint16_t AudioFormat;
-    uint16_t NumChannels;
-    uint32_t SampleRate;
-    uint32_t ByteRate;
-    uint16_t BlockAlign;
-    uint16_t BitsPerSample;
-    uint32_t Subchunk2ID;
-    uint32_t Subchunk2Size;
-} WAV_header_t;
-#pragma pack()
-
-
-#ifdef __CPLUSPLUS
-}
-#endif
-
-#endif /*_OALB_INTERFACE_TYPES_H*/
+/*
+ * OpenAL Bridge - a simple portable library for OpenAL interface
+ * Copyright (c) 2009 Vittorio Giovara <vittorio.giovara@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <stdint.h>
+
+#ifndef _OALB_INTERFACE_TYPES_H
+#define _OALB_INTERFACE_TYPES_H
+
+enum al_fade_enum {AL_FADE_IN, AL_FADE_OUT};
+typedef enum al_fade_enum al_fade_t;
+
+//data type for passing data between threads
+#pragma pack(1)
+typedef struct _fade_t {
+    uint32_t index;
+    uint16_t quantity;
+    al_fade_t type;
+} fade_t;
+#pragma pack()
+
+
+//data type for WAV header
+#pragma pack(1)
+typedef struct _WAV_header_t {
+    uint32_t ChunkID;
+    uint32_t ChunkSize;
+    uint32_t Format;
+    uint32_t Subchunk1ID;
+    uint32_t Subchunk1Size;
+    uint16_t AudioFormat;
+    uint16_t NumChannels;
+    uint32_t SampleRate;
+    uint32_t ByteRate;
+    uint16_t BlockAlign;
+    uint16_t BitsPerSample;
+    uint32_t Subchunk2ID;
+    uint32_t Subchunk2Size;
+} WAV_header_t;
+#pragma pack()
+
+
+#ifdef __CPLUSPLUS
+}
+#endif
+
+#endif /*_OALB_INTERFACE_TYPES_H*/