Changeset 196

Timestamp:

02/24/08 07:10:49 (4 months ago)

Author:

lordhavoc

Message:

updated ufoai plugin from mattn

Files:

• GtkRadiant/trunk/contrib/ufoaiplug/bitmaps/ufoai_actorclip.bmp (modified) (previous)
• GtkRadiant/trunk/contrib/ufoaiplug/bitmaps/ufoai_nodraw.bmp (added)
• GtkRadiant/trunk/contrib/ufoaiplug/bitmaps/ufoai_stepon.bmp (modified) (previous)
• GtkRadiant/trunk/contrib/ufoaiplug/bitmaps/ufoai_weaponclip.bmp (added)
• GtkRadiant/trunk/contrib/ufoaiplug/ufoai.cpp (modified) (5 diffs)
• GtkRadiant/trunk/contrib/ufoaiplug/ufoai_filters.cpp (modified) (3 diffs)
• GtkRadiant/trunk/contrib/ufoaiplug/ufoai_filters.h (modified) (2 diffs)
• GtkRadiant/trunk/contrib/ufoaiplug/ufoai_gtk.cpp (modified) (6 diffs)
• GtkRadiant/trunk/contrib/ufoaiplug/ufoai_level.cpp (modified) (5 diffs)
• GtkRadiant/trunk/contrib/ufoaiplug/ufoai_level.h (modified) (1 diff)

GtkRadiant/trunk/contrib/ufoaiplug/ufoai.cpp

@@ -33 +33 @@
-#include <gtk/gtk.h>
-
-2
+4
-
-#include "ifilter.h"
@@ -75 +75 @@
-        {
-                /*GlobalRadiant().getGameName()*/
- (day);Worldspawn reset (night);Worldspawn (day);Worldspawn (night);Perform check;-;Level 1;Level 2;Level 3;Level 4;Level 5;Level 6;Level 7;Level 8;-;StepOn;ActorClip
+;Worldspawn;Perform check;-;Level 1;Level 2;Level 3;Level 4;Level 5;Level 6;Level 7;Level 8;-;StepOn;ActorClip;WeaponClip;Nodraw
-        }
-        const char* getCommandTitleList()
@@ -87 +87 @@
-                {
-                        GlobalRadiant().m_pfnMessageBox(GTK_WIDGET(g_mainwnd),
-www.ufoai
+ufoai.sf
-                                eMB_OK, eMB_ICONDEFAULT);
-                }
@@ -102 +102 @@
-                        filter_level(CONTENTS_LEVEL3);
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                }
-                else if(string_equal(command, "Perform check"))
@@ -149 +141 @@
-                {
-                        filter_actorclip();
+                }
+                else if(string_equal(command, "WeaponClip"))
+                {
+                        filter_weaponclip();
+                }
+                else if(string_equal(command, "NoDraw"))
+                {
+                        filter_nodraw();
-                }
-

GtkRadiant/trunk/contrib/ufoaiplug/ufoai_filters.cpp

@@ -32 +32 @@
-bool actorclip_active = false;
-bool stepon_active = false;
+bool nodraw_active = false;
+bool weaponclip_active = false;
-int level_active = 0;
-
@@ -274 +276 @@
-}
-
+void filter_nodraw (void)
+{
+        if (nodraw_active) {
+                nodraw_active = false;
+        } else {
+                nodraw_active = true;
+        }
+        brushlist_t brushes;
+        GlobalSceneGraph().traverse(BrushGetLevel(brushes, SURF_NODRAW, false, false, nodraw_active));
+
+#ifdef _DEBUG
+        if (brushes.empty())
+        {
+                globalOutputStream() << "UFO:AI: No brushes.\n";
+        }
+        else
+        {
+                globalOutputStream() << "UFO:AI: Hiding " << Unsigned(brushes.size()) << " nodraw brushes.\n";
+        }
+#endif
+}
+
-void filter_actorclip (void)
-{
@@ -295 +319 @@
-#endif
-}
+
+void filter_weaponclip (void)
+{
+        if (weaponclip_active) {
+                weaponclip_active = false;
+        } else {
+                weaponclip_active = true;
+        }
+        brushlist_t brushes;
+        GlobalSceneGraph().traverse(BrushGetLevel(brushes, CONTENTS_WEAPONCLIP, true, false, weaponclip_active));
+
+#ifdef _DEBUG
+        if (brushes.empty())
+        {
+                globalOutputStream() << "UFO:AI: No brushes.\n";
+        }
+        else
+        {
+                globalOutputStream() << "UFO:AI: Hiding " << Unsigned(brushes.size()) << " weaponclip brushes.\n";
+        }
+#endif
+}

GtkRadiant/trunk/contrib/ufoaiplug/ufoai_filters.h

@@ -23 +23 @@
-void filter_stepon(void);
-void filter_actorclip(void);
+void filter_weaponclip(void);
+void filter_nodraw(void);
+
+#define SURF_NODRAW 0x80
-
-#define CONTENTS_LEVEL8 0x8000
@@ -33 +37 @@
-#define CONTENTS_LEVEL1 0x0100
-#define CONTENTS_ACTORCLIP 0x10000
-
+
-#define CONTENTS_STEPON 0x40000000
-

GtkRadiant/trunk/contrib/ufoaiplug/ufoai_gtk.cpp

@@ -68 +68 @@
-/* =============================== */
-
-0
+2
-
-/**
@@ -106 +106 @@
-                case 8: return "ufoai_stepon.bmp";
-                case 9: return "ufoai_actorclip.bmp";
+                case 10: return "ufoai_weaponclip.bmp";
+                case 11: return "ufoai_nodraw.bmp";
-                }
-                return NULL;
@@ -116 +118 @@
-                case 8: return eToggleButton;
-                case 9: return eToggleButton;
+                case 10: return eToggleButton;
+                case 11: return eToggleButton;
-                default: return eButton;
-                }
@@ -133 +137 @@
-                case 8: return "Stepon";
-                case 9: return "Actorclip";
+                case 10: return "Weaponclip";
+                case 11: return "Nodraw";
-                }
-                return NULL;
@@ -150 +156 @@
-                case 8: return "Hide stepon brushes";
-                case 9: return "Hide actorclip brushes";
+                case 10: return "Hide weaponclip brushes";
+                case 11: return "Hide nodraw brushes";
-                }
-                return NULL;
@@ -168 +176 @@
-                case 8: filter_stepon(); break;
-                case 9: filter_actorclip(); break;
+                case 10: filter_weaponclip(); break;
+                case 11: filter_nodraw(); break;
-                }
-                SceneChangeNotify();

GtkRadiant/trunk/contrib/ufoaiplug/ufoai_level.cpp

@@ -142 +142 @@
-
-/**
-, maxteams
-
-bool day, 
+
+
+
-{
-        static char message[1024];
@@ -163 +163 @@
-        *str = '\0';
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
@@ -308 +234 @@
-        if (!count)
-                strncat(message, "No multiplayer start positions (info_player_start)\n", sizeof(message) - 1);
-        else if (string_empty(worldspawn->getKeyValue("maxteams")))
-        {
-                snprintf(message, sizeof(message) - 1, "Worldspawn: No maxteams defined (#info_player_start) (set to: %i)\n", teams);
-                snprintf(str, sizeof(str) - 1, "%i", teams);
-                worldspawn->setKeyValue("maxteams", str);
-        }
-        else if (teams != atoi(worldspawn->getKeyValue("maxteams")))
-                snprintf(message, sizeof(message) - 1, "Worldspawn: Settings for maxteams (%s) doesn't match team count (%i)\n", worldspawn->getKeyValue("maxteams"), teams);
-
-        // singleplayer map?
@@ -322 +240 @@
-        if (!count)
-                strncat(message, "No singleplayer start positions (info_human_start)\n", sizeof(message) - 1);
+
+        // singleplayer map?
+        count = 0;
+        get_team_count("info_2x2_start", &count, NULL);
+        if (!count)
+                strncat(message, "No singleplayer start positions for 2x2 units (info_2x2_start)\n", sizeof(message) - 1);
-
-        // search for civilians
@@ -344 +268 @@
-        if (ent_flags)
-                snprintf(&message[strlen(message)], sizeof(message) - 1 - strlen(message), "Found %i func_breakable with no spawnflags\n", ent_flags);
+        ent_flags = check_entity_flags("misc_sound", "spawnflags");
+        if (ent_flags)
+                snprintf(&message[strlen(message)], sizeof(message) - 1 - strlen(message), "Found %i misc_sound with no spawnflags\n", ent_flags);
-        ent_flags = check_entity_flags("misc_model", "spawnflags");
-        if (ent_flags)

GtkRadiant/trunk/contrib/ufoaiplug/ufoai_level.h

@@ -20 +20 @@
-#define INCLUDED_UFOAI_LEVEL_H
-
-bool day, 
+
-void check_map_values (char **returnMsg);
-void get_team_count (const char *classname, int *count, int *team);