Changeset 1417Tweet

Timestamp:

May 29, 2012, 8:37:59 PM (9 years ago)

Author:

sam

Message:

orbital: undo the gun command parser changes.

Location:

trunk/orbital

Files:

• Makefile.am (modified) (3 diffs)
• generated/gun-parser.cpp (deleted)
• generated/gun-parser.hpp (deleted)
• generated/gun-scanner.cpp (deleted)
• gun.cpp (deleted)
• gun.h (modified) (2 diffs)
• gun.l (deleted)
• gun.yy (deleted)

trunk/orbital/Makefile.am

@@ -5 +5 @@
     orbital.cpp orbital.h \
     mesh.cpp mesh.h \
-    gun.cpp gun.h \
     particlesystem.h tank.h player.h gun.h snake.h starfield.h
 nodist_orbital_SOURCES = \
@@ -14 +13 @@
 orbital_DEPENDENCIES = $(top_builddir)/src/liblol.a \
     generated/mesh-scanner.cpp \
-    generated/mesh-parser.cpp \
-    generated/gun-scanner.cpp \
-    generated/gun-parser.cpp
+    generated/mesh-parser.cpp
 
 all-local: orbital$(EXEEXT)
@@ -26 +23 @@
         flex -o generated/mesh-scanner.cpp mesh.l
         bison -o generated/mesh-parser.cpp -d -b generated/mesh mesh.yy
-        flex -o generated/gun-scanner.cpp gun.l
-        bison -o generated/gun-parser.cpp -d -b generated/gun gun.yy
 .FORCE:
 endif

trunk/orbital/gun.h

@@ -5 +5 @@
 //
 
+/* TODO for this file:
+ *  - rename "AppendQuadVert" to "AddVertex" or something; it has nothing
+ *    to do with quads.
+ */
+
 extern char const *lolfx_shiny;
+
+#include "CommandParser.h"
 
 #if !defined __GUN_H__
 #define __GUN_H__
 
-namespace yy { class GunParser; }
-
-class Gun
+class Gun : public CommandParser
 {
-    friend class yy::GunParser;
-
 public:
     Gun()
@@ -34 +37 @@
     {}
 
-    void SendCommand(char const *command);
+    virtual void SwitchCommand(char const *&command)
+    {
+        vec4 v4;
+        vec3 v3;
+        float f1, f2, f3, f4, f5, f6, f7, f8;
+
+        const char *&p = command;
+        {
+#define CASE(str) if (CheckCommand(str, p))
+                 CASE("ai") { m_angle = AimActor(); }
+            else CASE("pai") { p = GetArg(p, f1); PreAimActor(f1); }
+            else CASE("ca") { p = GetArg(p, f1); m_pre_aim = f1; }
+            else CASE("sa") { p = GetArg(p, f1); m_angle = f1; }
+            else CASE("tim") { p = GetArg(p, f1); m_round_duration = f1; }
+            else CASE("so") { p = GetArg(p, f1); m_angle_offset = f1; }
+            else CASE("rd") { p = GetArg(p, f1); m_radius = f1; }
+            else CASE("spd") { p = GetArg(p, f1); m_shoot_speed = f1; }
+            else CASE("moda") { p = GetArg(p, v3); /* FIXME: 1st modifier */ }
+            else CASE("modb") { p = GetArg(p, v3); /* FIXME: 2nd modifier */ }
+            else CASE("ffb") { p = GetArg(p, f1); for (int i = 0; i < (int)f1; i++) Shoot(1); m_shoot_type = 1; m_round_timer = m_round_duration; }
+            else CASE("ffp") { p = GetArg(p, f1); for (int i = 0; i < (int)f1; i++) Shoot(0); m_shoot_type = 0; m_round_timer = m_round_duration; }
+            else CASE("fb") { p = GetArg(p, f1); Shoot(1); m_nbshoots = (int)f1 - 1; m_shoot_type = 1; m_round_timer = m_round_duration; }
+            else CASE("fp") { p = GetArg(p, f1); Shoot(0); m_nbshoots = (int)f1 - 1; m_shoot_type = 0; m_round_timer = m_round_duration; }
+            else CASE("sk") { p = GetArg(p, f1); m_round_timer = m_round_duration * f1; /* FIXME: modifiers */ }
+            else CASE("loop") { /* FIXME: loops */ }
+#undef CASE
+        }
+    }
 
     void Shoot(int count)