From 1019199749de5da4a7e087bc3244641960ccaa9e Mon Sep 17 00:00:00 2001 From: jdolan Date: Mon, 8 Jul 2013 22:20:13 -0400 Subject: [PATCH] Rename surface_ufoai to surface_idtech2. This plugin should be used for all Quake1 / Quake2 derived games. Updated game packs to be checked in shortly. --- config.py | 4 +- install/modules/bitmaps/ufoai_actorclip.bmp | Bin 494 -> 0 bytes install/modules/bitmaps/ufoai_level1.bmp | Bin 198 -> 0 bytes install/modules/bitmaps/ufoai_level2.bmp | Bin 198 -> 0 bytes install/modules/bitmaps/ufoai_level3.bmp | Bin 198 -> 0 bytes install/modules/bitmaps/ufoai_level4.bmp | Bin 198 -> 0 bytes install/modules/bitmaps/ufoai_level5.bmp | Bin 198 -> 0 bytes install/modules/bitmaps/ufoai_level6.bmp | Bin 198 -> 0 bytes install/modules/bitmaps/ufoai_level7.bmp | Bin 198 -> 0 bytes install/modules/bitmaps/ufoai_level8.bmp | Bin 198 -> 0 bytes install/modules/bitmaps/ufoai_nodraw.bmp | Bin 498 -> 0 bytes install/modules/bitmaps/ufoai_stepon.bmp | Bin 458 -> 0 bytes install/modules/bitmaps/ufoai_weaponclip.bmp | Bin 558 -> 0 bytes plugins/surface_idtech2/surface_idtech2.def | 7 ++ .../surface_idtech2.vcproj} | 14 +-- .../surface_idtech2.vcxproj} | 20 ++-- .../surface_idtech2.vcxproj.filters} | 4 +- .../surfacedialog.cpp | 23 ++-- .../surfacedialog.h | 0 .../surfaceflagsdialog_idtech2.cpp} | 10 +- .../surfaceflagsdialog_idtech2.h} | 6 +- .../surfdlg_plugin.cpp | 8 +- .../surfdlg_plugin.h | 0 plugins/surface_ufoai/surface_ufoai.def | 7 -- po/de.po | 104 ------------------ radiant.pot | 104 ------------------ radiant.sln | 4 +- 27 files changed, 49 insertions(+), 266 deletions(-) delete mode 100644 install/modules/bitmaps/ufoai_actorclip.bmp delete mode 100644 install/modules/bitmaps/ufoai_level1.bmp delete mode 100644 install/modules/bitmaps/ufoai_level2.bmp delete mode 100644 install/modules/bitmaps/ufoai_level3.bmp delete mode 100644 install/modules/bitmaps/ufoai_level4.bmp delete mode 100644 install/modules/bitmaps/ufoai_level5.bmp delete mode 100644 install/modules/bitmaps/ufoai_level6.bmp delete mode 100644 install/modules/bitmaps/ufoai_level7.bmp delete mode 100644 install/modules/bitmaps/ufoai_level8.bmp delete mode 100644 install/modules/bitmaps/ufoai_nodraw.bmp delete mode 100644 install/modules/bitmaps/ufoai_stepon.bmp delete mode 100644 install/modules/bitmaps/ufoai_weaponclip.bmp create mode 100644 plugins/surface_idtech2/surface_idtech2.def rename plugins/{surface_ufoai/surface_ufoai.vcproj => surface_idtech2/surface_idtech2.vcproj} (92%) rename plugins/{surface_ufoai/surface_ufoai.vcxproj => surface_idtech2/surface_idtech2.vcxproj} (94%) rename plugins/{surface_ufoai/surface_ufoai.vcxproj.filters => surface_idtech2/surface_idtech2.vcxproj.filters} (87%) rename plugins/{surface_ufoai => surface_idtech2}/surfacedialog.cpp (98%) rename plugins/{surface_ufoai => surface_idtech2}/surfacedialog.h (100%) rename plugins/{surface_ufoai/surfaceflagsdialog_ufoai.cpp => surface_idtech2/surfaceflagsdialog_idtech2.cpp} (97%) rename plugins/{surface_ufoai/surfaceflagsdialog_ufoai.h => surface_idtech2/surfaceflagsdialog_idtech2.h} (88%) rename plugins/{surface_ufoai => surface_idtech2}/surfdlg_plugin.cpp (92%) rename plugins/{surface_ufoai => surface_idtech2}/surfdlg_plugin.h (100%) delete mode 100644 plugins/surface_ufoai/surface_ufoai.def diff --git a/config.py b/config.py index 72571a8..6ba8f27 100644 --- a/config.py +++ b/config.py @@ -113,9 +113,7 @@ class Config: 'plugins/mapxml/mapxml.vcproj', 'plugins/shaders/shaders.vcproj', 'plugins/surface/surface.vcproj', - 'plugins/surface_ufoai/surface_ufoai.vcproj', - 'plugins/surface_quake2/surface_quake2.vcproj', - 'plugins/surface_heretic2/surface_heretic2.vcproj', + 'plugins/surface_idtech2/surface_idtech2.vcproj', 'contrib/camera/camera.vcproj', 'contrib/prtview/prtview.vcproj', 'contrib/hydratoolz/hydratoolz.vcproj', diff --git a/install/modules/bitmaps/ufoai_actorclip.bmp b/install/modules/bitmaps/ufoai_actorclip.bmp deleted file mode 100644 index 4a2887c6ae391bde30288a53fecd32ecf7e95051..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 494 zcmbWvyGuf07zXg?bhXTD+0m|=UF_azbCU)^Fjoh!C{Bt)Ac9M0XsW3#i2i_vD1r(l zbLj$2)nI}B1wj$CXV0fjZS}zK<$GTE-nI1)35|Sny2wZdlAz%PKFO?YTIE{+Hc6!| z+NJ|Kq+>dvQ#zv}mFSYnRH0kCqX&AVC#upj)u;})djlSi3a@tuKHo0<{yhW&``pzL z3?3mAI!8Esfk>oCB}AiT#9~*7$16xAu8~aMAeFjDI$cF3^MY))Mz6@_-jL6~qfq#Q zs@5U5qO|g#Zq^yQrY05}7sP+adi}I*ctk8jH|Y$63y$$g(Z_y8S#~<-?DGz}w|l^% nm1RY-T8CB?n=JLTw{?g<<65%Mj`sIyES)CNn-OH1V76Jf4u@TV# diff --git a/install/modules/bitmaps/ufoai_level2.bmp b/install/modules/bitmaps/ufoai_level2.bmp deleted file mode 100644 index e84e254434fe221653da07189d16146fa36aa9ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 198 zcmYj~!3}^g3&148an7_`^KR!az*Z6{=t-svwbbt&=GG@gU+PRw`2?mC&&Q z7c~!|o^MHEW>9X-vJ}+2MuRm?9{Ho2{CkVc;Dq`zL>ZzCC(Dn%DGO~*`|aQhD#j6R diff --git a/install/modules/bitmaps/ufoai_level3.bmp b/install/modules/bitmaps/ufoai_level3.bmp deleted file mode 100644 index 141c32457872bce1579e51417c3b8afa73c0b01f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 198 zcmY*Su?>JQ409#K!a##Kf+twm;T~?`Ag<{PRd5n2gd@kbqomt@BXCd_GLs{j(6Iw2 zISs*{Z=*p~VYRZ#Tu`qX1NJ12{3)-B&?jq=HVF}a diff --git a/install/modules/bitmaps/ufoai_level6.bmp b/install/modules/bitmaps/ufoai_level6.bmp deleted file mode 100644 index 418fdd280dc849add3cc4d3d307e245e0ef77906..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 198 zcmZ?rJ;ne5en3hChy{R{ABY(lSb!u0Lj@2EaYHa0kPX5h@c;jR1`xCb!Z#vs82--s y3y}bljDlbwfJ8Ge2nquE0*qin5XfTy@iAzaJWM^vAcz)_W}q&JIS}(<76Je$4-s1c diff --git a/install/modules/bitmaps/ufoai_level7.bmp b/install/modules/bitmaps/ufoai_level7.bmp deleted file mode 100644 index d82dab61c387a5f974bad9a52dde617aaf298b81..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 198 zcmZ?rJ;ne5en3hChy{R{ABY(lSb!u0Lj@2EaYHa0kPX5h@c;jR1`xCb!Z#vs82--s y3y}bljDlbwfJ8F@ML>Lz9EgTvpafVQoMwdZfr4Oh7%j*E;)AS!h=a_7SqK0^mJzT3 diff --git a/install/modules/bitmaps/ufoai_level8.bmp b/install/modules/bitmaps/ufoai_level8.bmp deleted file mode 100644 index c3809538b01aa2cc6b430fa75a63c18c842e401c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 198 zcmZ?rJ;ne5en3hChy{R{ABY(lSb!u0Lj@2EaYHa0kPX5h@c;jR1`xCb!Z#vs82--s r3y}bljDlbwfS`eMQ9fD z4_?~w$(ZnCW|a;O=;u&y!~n+(al$ZXSP5d|LU4(l5Du;x;_0Yc6IS7RI8PHb~Gxy$qHKA(%He0k3a`+{hrk)rv(YZ6nFGt>0?%KB2H zBx$uO6)~|H`2|HKd38UYk&u!UpHpk7u4*($QpKOhwKYxU>B=m*TK3|yLPc)euj?9g PYGwAXi%b9iXXM2_RXB7j3R}BM$cP#^hUlW62P$mOIKpTT%XgLEz zXfK0eWIY2z{5%GRgar)xshtcusoe~&>2(bH*^?OjO8Xh?E9Nl-RZV5Et6jkm-ZY;f zs%;5FOy>%Q*zQ#f_PvJ~5+-b5NSeHbA#=`thJxj17>d_iVkldGouO{eGX@bT(0~GJ z^Z8ksxVag)*d^7a<)y`C#fA7}BqTVbM8#M*6ge0LI8+tXb0IR%-8d1&Ph Gn7;s?3r%1E diff --git a/install/modules/bitmaps/ufoai_weaponclip.bmp b/install/modules/bitmaps/ufoai_weaponclip.bmp deleted file mode 100644 index 799468ba2bc51b1046ce470176b7fe34c129007e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 558 zcmbWx$uHbt9LMqZpeSYROSKrr&KTQZhM$>{NRbikK@UU*O==4v60t-^kTl_fLtBKu zpa&-h;y_|K&_=9@12>67B~2tvnoPex%f-0M{x{6(IwVed9U~i+xsyvUt|9;4wm0g zdP_y!Bo!YgLHR5GL7AJ%`e~}_XK*;@sA-y~wq=Qi-W3}AR&n;P(>$=rr{Qg^-EKa+ z_GlgbN!!=~?c;}ZOdN@0dZsSKC4*o8F!cQv*OHrzhu9wSoIWBT# Disabled $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;SURFACE_UFOAI_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;SURFACE_IDTECH2_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -85,7 +85,7 @@ /STACK:8388608 %(AdditionalOptions) ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) - surface_ufoai.def + surface_idtech2.def true Windows MachineX86 @@ -95,7 +95,7 @@ Disabled $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;SURFACE_UFOAI_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;SURFACE_IDTECH2_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -108,7 +108,7 @@ /STACK:8388608 %(AdditionalOptions) ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) - surface_ufoai.def + surface_idtech2.def true Windows @@ -116,7 +116,7 @@ $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;SURFACE_UFOAI_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;SURFACE_IDTECH2_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL Level3 @@ -127,7 +127,7 @@ /STACK:8388608 %(AdditionalOptions) ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) - surface_ufoai.def + surface_idtech2.def true Windows true @@ -138,7 +138,7 @@ $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;SURFACE_UFOAI_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;SURFACE_IDTECH2_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -150,7 +150,7 @@ /STACK:8388608 %(AdditionalOptions) ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) - surface_ufoai.def + surface_idtech2.def true Windows true @@ -158,11 +158,11 @@ - + - + diff --git a/plugins/surface_ufoai/surface_ufoai.vcxproj.filters b/plugins/surface_idtech2/surface_idtech2.vcxproj.filters similarity index 87% rename from plugins/surface_ufoai/surface_ufoai.vcxproj.filters rename to plugins/surface_idtech2/surface_idtech2.vcxproj.filters index 862974d..f11a670 100644 --- a/plugins/surface_ufoai/surface_ufoai.vcxproj.filters +++ b/plugins/surface_idtech2/surface_idtech2.vcxproj.filters @@ -7,7 +7,7 @@ - + src @@ -15,7 +15,7 @@ src - + src diff --git a/plugins/surface_ufoai/surfacedialog.cpp b/plugins/surface_idtech2/surfacedialog.cpp similarity index 98% rename from plugins/surface_ufoai/surfacedialog.cpp rename to plugins/surface_idtech2/surfacedialog.cpp index 790e734..efc86d4 100644 --- a/plugins/surface_ufoai/surfacedialog.cpp +++ b/plugins/surface_idtech2/surfacedialog.cpp @@ -23,19 +23,12 @@ // Surface Dialog Module // -// -// Nurail: Implemented to Module from the main Radiant Surface Dialog code -// - - #include #include #include #include "surfdlg_plugin.h" - - #ifdef _DEBUG //#define DBG_SI 1 #endif @@ -75,10 +68,10 @@ void DoSnapTToGrid( float hscale, float vscale ); // called to perform a fitting from the outside (shortcut key) void SurfaceDialogFitAll(); -// UFOAI Flags Functions -void SetFlagButtons_UFOAI( texdef_to_face_t *texdef_face_list, bool b_isListEmpty ); -void SetChangeInFlags_Face_UFOAI( texdef_to_face_t *texdef_face_list ); -GtkWidget* Create_UFOAIFlagsDialog( GtkWidget* surfacedialog_widget ); +// IDTECH2 Flags Functions +void SetFlagButtons_IDTECH2( texdef_to_face_t *texdef_face_list, bool b_isListEmpty ); +void SetChangeInFlags_Face_IDTECH2( texdef_to_face_t *texdef_face_list ); +GtkWidget* Create_IDTECH2FlagsDialog( GtkWidget* surfacedialog_widget ); // Dialog Data @@ -344,10 +337,10 @@ static void GetTexdefInfo_from_Radiant(){ IsFaceConflicting(); PopulateTextureComboList(); if ( texdef_face_list_empty() ) { - SetFlagButtons_UFOAI( get_texdef_face_list(), TRUE ); + SetFlagButtons_IDTECH2( get_texdef_face_list(), TRUE ); } else{ - SetFlagButtons_UFOAI( get_texdef_face_list(), FALSE ); + SetFlagButtons_IDTECH2( get_texdef_face_list(), FALSE ); } } @@ -541,7 +534,7 @@ void GetTexMods( bool b_SetUndoPoint ){ if ( !texdef_face_list_empty() ) { g_bListenUpdate = FALSE; - SetChangeInFlags_Face_UFOAI( get_texdef_face_list() ); + SetChangeInFlags_Face_IDTECH2( get_texdef_face_list() ); SetTexdef_FaceList( get_texdef_face_list(), b_SetUndoPoint, FALSE ); g_bListenUpdate = TRUE; @@ -813,7 +806,7 @@ GtkWidget* create_SurfaceInspector( void ){ (GtkAttachOptions) ( 0 ), 0, 0 ); // Add the SURF_ and CONTENTS_ flags frame - Create_UFOAIFlagsDialog( vbox1 ); + Create_IDTECH2FlagsDialog( vbox1 ); g_signal_connect( (gpointer) SurfaceInspector, "delete_event", diff --git a/plugins/surface_ufoai/surfacedialog.h b/plugins/surface_idtech2/surfacedialog.h similarity index 100% rename from plugins/surface_ufoai/surfacedialog.h rename to plugins/surface_idtech2/surfacedialog.h diff --git a/plugins/surface_ufoai/surfaceflagsdialog_ufoai.cpp b/plugins/surface_idtech2/surfaceflagsdialog_idtech2.cpp similarity index 97% rename from plugins/surface_ufoai/surfaceflagsdialog_ufoai.cpp rename to plugins/surface_idtech2/surfaceflagsdialog_idtech2.cpp index a2b024d..6a0c593 100644 --- a/plugins/surface_ufoai/surfaceflagsdialog_ufoai.cpp +++ b/plugins/surface_idtech2/surfaceflagsdialog_idtech2.cpp @@ -26,7 +26,7 @@ #include "surfdlg_plugin.h" -#include "surfaceflagsdialog_ufoai.h" +#include "surfaceflagsdialog_idtech2.h" GtkWidget *notebook1; @@ -80,7 +80,7 @@ void clear_all_buttons_and_values(){ gtk_entry_set_text( (GtkEntry *)value_entry, "" ); } -void SetFlagButtons_UFOAI( texdef_to_face_t *texdef_face_list, bool b_isListEmpty ){ +void SetFlagButtons_IDTECH2( texdef_to_face_t *texdef_face_list, bool b_isListEmpty ){ int contents = 0; int flags = 0; int value = 0; @@ -167,7 +167,7 @@ void SetFlagButtons_UFOAI( texdef_to_face_t *texdef_face_list, bool b_isListEmpt setup_buttons = FALSE; } -void SetChangeInFlags_Face_UFOAI( texdef_to_face_t *faces ){ +void SetChangeInFlags_Face_IDTECH2( texdef_to_face_t *faces ){ texdef_to_face_t *face; texdef_t *tex; @@ -281,9 +281,9 @@ void on_contentbutton_clicked( GtkButton *button, gpointer user_data ){ gtk_notebook_set_page( GTK_NOTEBOOK( notebook1 ), 1 ); } -#define UFOAI_FLAG_BUTTON_BORDER 3 +#define IDTECH2_FLAG_BUTTON_BORDER 3 -GtkWidget* Create_UFOAIFlagsDialog( GtkWidget* surfacedialog_widget ){ +GtkWidget* Create_IDTECH2FlagsDialog( GtkWidget* surfacedialog_widget ){ GtkWidget *frame1; GtkWidget *vbox1; GtkWidget *vbox2; diff --git a/plugins/surface_ufoai/surfaceflagsdialog_ufoai.h b/plugins/surface_idtech2/surfaceflagsdialog_idtech2.h similarity index 88% rename from plugins/surface_ufoai/surfaceflagsdialog_ufoai.h rename to plugins/surface_idtech2/surfaceflagsdialog_idtech2.h index 210bb4a..e9f1140 100644 --- a/plugins/surface_ufoai/surfaceflagsdialog_ufoai.h +++ b/plugins/surface_idtech2/surfaceflagsdialog_idtech2.h @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _SURFACEFLAGSDIALOG_UFOAI_H -#define _SURFACEFLAGSDIALOG_UFOAI_H +#ifndef _SURFACEFLAGSDIALOG_IDTECH2_H +#define _SURFACEFLAGSDIALOG_IDTECH2_H -#endif // _SURFACEFLAGSDIALOG_UFOAI_H +#endif // _SURFACEFLAGSDIALOG_IDTECH2_H diff --git a/plugins/surface_ufoai/surfdlg_plugin.cpp b/plugins/surface_idtech2/surfdlg_plugin.cpp similarity index 92% rename from plugins/surface_ufoai/surfdlg_plugin.cpp rename to plugins/surface_idtech2/surfdlg_plugin.cpp index a73aa0c..52b1c4f 100644 --- a/plugins/surface_ufoai/surfdlg_plugin.cpp +++ b/plugins/surface_idtech2/surfdlg_plugin.cpp @@ -76,12 +76,12 @@ extern "C" CSynapseClient * SYNAPSE_DLL_EXPORT Synapse_EnumerateInterfaces( cons g_pSynapseServer->IncRef(); Set_Syn_Printf( g_pSynapseServer->Get_Syn_Printf() ); - g_SynapseClient.AddAPI( SURFACEDIALOG_MAJOR, "ufoai", sizeof( _QERPlugSurfaceTable ) ); + g_SynapseClient.AddAPI( SURFACEDIALOG_MAJOR, "idtech2", sizeof( _QERPlugSurfaceTable ) ); g_SynapseClient.AddAPI( RADIANT_MAJOR, NULL, sizeof( _QERFuncTable_1 ), SYN_REQUIRE, &g_FuncTable ); g_SynapseClient.AddAPI( UNDO_MAJOR, NULL, sizeof( _QERUndoTable ), SYN_REQUIRE, &g_UndoTable ); g_SynapseClient.AddAPI( APPSURFACEDIALOG_MAJOR, NULL, sizeof( _QERAppSurfaceTable ), SYN_REQUIRE, &g_AppSurfaceTable ); g_SynapseClient.AddAPI( SELECTEDFACE_MAJOR, NULL, sizeof( _QERSelectedFaceTable ), SYN_REQUIRE, &g_SelectedFaceTable ); - g_SynapseClient.AddAPI( SHADERS_MAJOR, "ufoai", sizeof( _QERShadersTable ), SYN_REQUIRE, &g_ShadersTable ); + g_SynapseClient.AddAPI( SHADERS_MAJOR, "idtech2", sizeof( _QERShadersTable ), SYN_REQUIRE, &g_ShadersTable ); g_SynapseClient.AddAPI( APPSHADERS_MAJOR, NULL, sizeof( _QERAppShadersTable ), SYN_REQUIRE, &g_AppShadersTable ); g_SynapseClient.AddAPI( DATA_MAJOR, NULL, sizeof( _QERAppDataTable ), SYN_REQUIRE, &g_AppDataTable ); @@ -91,7 +91,7 @@ extern "C" CSynapseClient * SYNAPSE_DLL_EXPORT Synapse_EnumerateInterfaces( cons bool CSynapseClient_SurfDLG::RequestAPI( APIDescriptor_t *pAPI ){ if ( !strcmp( pAPI->major_name, SURFACEDIALOG_MAJOR ) ) { _QERPlugSurfaceTable* pSurfDialogTable = static_cast<_QERPlugSurfaceTable*>( pAPI->mpTable ); - if ( !strcmp( pAPI->minor_name, "ufoai" ) ) { + if ( !strcmp( pAPI->minor_name, "idtech2" ) ) { pSurfDialogTable->m_pfnToggleSurface = &ToggleSurface; pSurfDialogTable->m_pfnDoSurface = &DoSurface; pSurfDialogTable->m_pfnUpdateSurfaceDialog = &UpdateSurfaceDialog; @@ -108,7 +108,7 @@ bool CSynapseClient_SurfDLG::RequestAPI( APIDescriptor_t *pAPI ){ #include "version.h" const char* CSynapseClient_SurfDLG::GetInfo(){ - return "Surface Dialog (UFO: Alien Invasion) module built " __DATE__ " " RADIANT_VERSION; + return "Surface Dialog (idTech2) module built " __DATE__ " " RADIANT_VERSION; } const char* CSynapseClient_SurfDLG::GetName(){ diff --git a/plugins/surface_ufoai/surfdlg_plugin.h b/plugins/surface_idtech2/surfdlg_plugin.h similarity index 100% rename from plugins/surface_ufoai/surfdlg_plugin.h rename to plugins/surface_idtech2/surfdlg_plugin.h diff --git a/plugins/surface_ufoai/surface_ufoai.def b/plugins/surface_ufoai/surface_ufoai.def deleted file mode 100644 index 588ea28..0000000 --- a/plugins/surface_ufoai/surface_ufoai.def +++ /dev/null @@ -1,7 +0,0 @@ -; surface_ufoai.def : Declares the module parameters for the DLL. - -LIBRARY "SURFACE_UFOAI" - -EXPORTS - ; Explicit exports can go here - Synapse_EnumerateInterfaces @1 diff --git a/po/de.po b/po/de.po index 1d35150..f61ce8f 100644 --- a/po/de.po +++ b/po/de.po @@ -37,110 +37,6 @@ msgstr "" msgid "Select Inside" msgstr "" -#: contrib/ufoai/plugin.cpp:48 -msgid "UFO: Alien Invasion plugin " -msgstr "UFO: Alien Invasion plugin " - -#: contrib/ufoai/plugin.cpp:64 -msgid "Filter actorclip" -msgstr "" - -#: contrib/ufoai/plugin.cpp:65 -msgid "Actorclip" -msgstr "" - -#: contrib/ufoai/plugin.cpp:71 -msgid "Filter weaponclip" -msgstr "" - -#: contrib/ufoai/plugin.cpp:72 -msgid "Weaponclip" -msgstr "" - -#: contrib/ufoai/plugin.cpp:78 -msgid "Filter nodraw" -msgstr "" - -#: contrib/ufoai/plugin.cpp:79 -msgid "NoDraw" -msgstr "" - -#: contrib/ufoai/plugin.cpp:85 -msgid "Filter stepon" -msgstr "" - -#: contrib/ufoai/plugin.cpp:86 -msgid "Stepon" -msgstr "" - -#: contrib/ufoai/plugin.cpp:92 -msgid "Filter level1" -msgstr "Filter level1" - -#: contrib/ufoai/plugin.cpp:93 -msgid "Level 1" -msgstr "Level 1" - -#: contrib/ufoai/plugin.cpp:99 -msgid "Filter level2" -msgstr "Filter level2" - -#: contrib/ufoai/plugin.cpp:100 -msgid "Level 2" -msgstr "Level 2" - -#: contrib/ufoai/plugin.cpp:106 -msgid "Filter level3" -msgstr "Filter level3" - -#: contrib/ufoai/plugin.cpp:107 -msgid "Level 3" -msgstr "Level 3" - -#: contrib/ufoai/plugin.cpp:113 -msgid "Filter level4" -msgstr "Filter level4" - -#: contrib/ufoai/plugin.cpp:114 -msgid "Level 4" -msgstr "Level 4" - -#: contrib/ufoai/plugin.cpp:120 -msgid "Filter level5" -msgstr "Filter level5" - -#: contrib/ufoai/plugin.cpp:121 -msgid "Level 5" -msgstr "Level 5" - -#: contrib/ufoai/plugin.cpp:127 -msgid "Filter level6" -msgstr "Filter level6" - -#: contrib/ufoai/plugin.cpp:128 -msgid "Level 6" -msgstr "Level 6" - -#: contrib/ufoai/plugin.cpp:134 -msgid "Filter level7" -msgstr "Filter level7" - -#: contrib/ufoai/plugin.cpp:135 -msgid "Level 7" -msgstr "Level 7" - -#: contrib/ufoai/plugin.cpp:141 -msgid "Filter level8" -msgstr "Filter level8" - -#: contrib/ufoai/plugin.cpp:142 -msgid "Level 8" -msgstr "Level 8" - -#: contrib/ufoai/plugin.cpp:210 -msgid "About" -msgstr "Über" - #: radiant/mainframe.cpp:939 #: radiant/mainframe.cpp:934 msgid "_File" diff --git a/radiant.pot b/radiant.pot index 414a650..272ce48 100644 --- a/radiant.pot +++ b/radiant.pot @@ -17,110 +17,6 @@ msgstr "" msgid "Select Inside" msgstr "" -#: contrib/ufoai/plugin.cpp:48 -msgid "UFO: Alien Invasion plugin " -msgstr "" - -#: contrib/ufoai/plugin.cpp:64 -msgid "Filter actorclip" -msgstr "" - -#: contrib/ufoai/plugin.cpp:65 -msgid "Actorclip" -msgstr "" - -#: contrib/ufoai/plugin.cpp:71 -msgid "Filter weaponclip" -msgstr "" - -#: contrib/ufoai/plugin.cpp:72 -msgid "Weaponclip" -msgstr "" - -#: contrib/ufoai/plugin.cpp:78 -msgid "Filter nodraw" -msgstr "" - -#: contrib/ufoai/plugin.cpp:79 -msgid "NoDraw" -msgstr "" - -#: contrib/ufoai/plugin.cpp:85 -msgid "Filter stepon" -msgstr "" - -#: contrib/ufoai/plugin.cpp:86 -msgid "Stepon" -msgstr "" - -#: contrib/ufoai/plugin.cpp:92 -msgid "Filter level1" -msgstr "" - -#: contrib/ufoai/plugin.cpp:93 -msgid "Level 1" -msgstr "" - -#: contrib/ufoai/plugin.cpp:99 -msgid "Filter level2" -msgstr "" - -#: contrib/ufoai/plugin.cpp:100 -msgid "Level 2" -msgstr "" - -#: contrib/ufoai/plugin.cpp:106 -msgid "Filter level3" -msgstr "" - -#: contrib/ufoai/plugin.cpp:107 -msgid "Level 3" -msgstr "" - -#: contrib/ufoai/plugin.cpp:113 -msgid "Filter level4" -msgstr "" - -#: contrib/ufoai/plugin.cpp:114 -msgid "Level 4" -msgstr "" - -#: contrib/ufoai/plugin.cpp:120 -msgid "Filter level5" -msgstr "" - -#: contrib/ufoai/plugin.cpp:121 -msgid "Level 5" -msgstr "" - -#: contrib/ufoai/plugin.cpp:127 -msgid "Filter level6" -msgstr "" - -#: contrib/ufoai/plugin.cpp:128 -msgid "Level 6" -msgstr "" - -#: contrib/ufoai/plugin.cpp:134 -msgid "Filter level7" -msgstr "" - -#: contrib/ufoai/plugin.cpp:135 -msgid "Level 7" -msgstr "" - -#: contrib/ufoai/plugin.cpp:141 -msgid "Filter level8" -msgstr "" - -#: contrib/ufoai/plugin.cpp:142 -msgid "Level 8" -msgstr "" - -#: contrib/ufoai/plugin.cpp:210 -msgid "About" -msgstr "" - #: radiant/mainframe.cpp:939 radiant/mainframe.cpp:934 msgid "_File" msgstr "" diff --git a/radiant.sln b/radiant.sln index be856b2..586e4a4 100644 --- a/radiant.sln +++ b/radiant.sln @@ -59,7 +59,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spritemodel", "plugins\spri EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "textool", "plugins\textool\textool.vcxproj", "{4F52DED4-285A-4E99-9C78-734D59E8ACD6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "surface_ufoai", "plugins\surface_ufoai\surface_ufoai.vcxproj", "{F400371F-455F-4B6C-9F13-A2E57110E725}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "surface_idtech2", "plugins\surface_idtech2\surface_idtech2.vcxproj", "{F400371F-455F-4B6C-9F13-A2E57110E725}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "surface_quake2", "plugins\surface_quake2\surface_quake2.vcxproj", "{32AB82AA-C781-4E5E-83A0-A164D371306F}" EndProject @@ -73,7 +73,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bobtoolz", "contrib\bobtool EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtkgensurf", "contrib\gtkgensurf\gtkgensurf.vcxproj", "{E37A9846-84FC-48F8-9880-954C5D9F8ED0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ufoai", "contrib\ufoai\ufoai.vcxproj", "{850DD97C-B457-497D-B5F5-DA1904FAC5F9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "idtech2", "contrib\idtech2\idtech2.vcxproj", "{850DD97C-B457-497D-B5F5-DA1904FAC5F9}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bkgrnd2d", "contrib\bkgrnd2d\bkgrnd2d.vcxproj", "{D43C13B9-35AC-4EC1-8A90-DF6D7132B9BD}" EndProject