Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 13:47:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use #pragma once instead of #ifndef

Browse source
This commit is contained in:
smallmodel 2024-09-27 20:19:11 +02:00
parent 94f308c50f
commit bf184fb719
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
61 changed files with 118 additions and 311 deletions
Download patch file Download diff file Expand all files Collapse all files

5
code/client/cl_uidmbox.h
View file

@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifndef __CL_UIDMBOX_H__ #pragma once
#define __CL_UIDMBOX_H__
static constexpr unsigned int DMBOX_ITEM_FLAG_BOLD = 2u; static constexpr unsigned int DMBOX_ITEM_FLAG_BOLD = 2u;
static constexpr unsigned int DMBOX_ITEM_FLAG_DEATH = 4u; static constexpr unsigned int DMBOX_ITEM_FLAG_DEATH = 4u;
@ -77,5 +76,3 @@ public:
void setRealShow( bool b ); void setRealShow( bool b );
void Clear( void ); void Clear( void );
}; };
#endif /* __CL_UIDMBOX_H__ */

5
code/client/cl_uigmbox.h
View file

@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifndef __CL_UIGMBOX_H__ #pragma once
#define __CL_UIGMBOX_H__
static constexpr unsigned int GMBOX_ITEM_FLAG_BOLD = 1u; static constexpr unsigned int GMBOX_ITEM_FLAG_BOLD = 1u;
@ -74,5 +73,3 @@ public:
void setRealShow( bool b ); void setRealShow( bool b );
void Clear( void ); void Clear( void );
}; };
#endif

7
code/fgame/archive.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// archive.h: OpenMoHAA Archiver // archive.h: OpenMoHAA Archiver
#ifndef __ARCHIVE_H__ #pragma once
#define __ARCHIVE_H__
#include "g_local.h" #include "g_local.h"
#include "class.h" #include "class.h"
@ -343,5 +342,3 @@ void con_map<key, value>::Archive(Archiver& arc)
arc.ArchiveInteger(&tempInt); \ arc.ArchiveInteger(&tempInt); \
(thing) = (type)tempInt; \ (thing) = (type)tempInt; \
} }
#endif // __ARCHIVE_H__

7
code/fgame/armor.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// armor.h: Standard armor that prevents a percentage of damage per hit. // armor.h: Standard armor that prevents a percentage of damage per hit.
#ifndef __ARMOR_H__ #pragma once
#define __ARMOR_H__
#include "weapon.h" #include "weapon.h"
@ -40,5 +39,3 @@ class Armor : public Item
qboolean Pickupable( Entity *other ) override; qboolean Pickupable( Entity *other ) override;
}; };
#endif /* armor.h */

7
code/fgame/barrels.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// barrels.h : Barrels // barrels.h : Barrels
#ifndef __BARRELOBJECT_H__ #pragma once
#define __BARRELOBJECT_H__
#include "entity.h" #include "entity.h"
@ -90,5 +89,3 @@ inline void BarrelObject::Archive
arc.ArchiveVector( &m_vLeakNorms[ i ] ); arc.ArchiveVector( &m_vLeakNorms[ i ] );
} }
} }
#endif // __BARRELOBJECT_H__

7
code/fgame/baseimp.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifndef __BASEIMP_H__ #pragma once
#define __BASEIMP_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -86,5 +85,3 @@ void CacheResource( const char *name );
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif

7
code/fgame/beam.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// beam.h: Beam // beam.h: Beam
#ifndef __BEAM_H__ #pragma once
#define __BEAM_H__
#include "g_local.h" #include "g_local.h"
#include "scriptslave.h" #include "scriptslave.h"
@ -123,5 +122,3 @@ inline void FuncBeam::Archive
SetBeamShader( shader ); SetBeamShader( shader );
} }
} }
#endif // __BEAM_H__

7
code/fgame/body.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// body.h: Dead bodies // body.h: Dead bodies
#ifndef __BODY_H__ #pragma once
#define __BODY_H__
#include "animate.h" #include "animate.h"
@ -39,5 +38,3 @@ public:
CLASS_PROTOTYPE( Body ); CLASS_PROTOTYPE( Body );
Body(); Body();
}; };
#endif //__BODY_H__

4
code/fgame/botlib.h
View file

@ -13,8 +13,7 @@
* *
*****************************************************************************/ *****************************************************************************/
#ifndef __BOTLIB_H__ #pragma once
#define __BOTLIB_H__
#define BOTLIB_API_VERSION 2 #define BOTLIB_API_VERSION 2
@ -503,4 +502,3 @@ name: default: module(s): description:
"max_levelitems" "256" be_ai_goal.c maximum number of level items "max_levelitems" "256" be_ai_goal.c maximum number of level items
*/ */
#endif

7
code/fgame/bspline.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// bspline.h: Uniform non-rational bspline class. // bspline.h: Uniform non-rational bspline class.
// //
#ifndef __BSPLINE_H__ #pragma once
#define __BSPLINE_H__
#include "g_local.h" #include "g_local.h"
#include "entity.h" #include "entity.h"
@ -580,5 +579,3 @@ inline void SplinePath::SetTriggerTarget
{ {
triggertarget = name; triggertarget = name;
} }
#endif /* __BSPLINE_H__ */

7
code/fgame/characterstate.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// characterstate.h: Character state // characterstate.h: Character state
#ifndef __CHARACTERSTATE_H__ #pragma once
#define __CHARACTERSTATE_H__
#include "g_local.h" #include "g_local.h"
#include "entity.h" #include "entity.h"
@ -359,5 +358,3 @@ StateMap *GetStatemap(
qboolean cache_only = false qboolean cache_only = false
); );
void CacheStatemap(str filename, Condition<Class> *conditions); void CacheStatemap(str filename, Condition<Class> *conditions);
#endif /* !__CHARACTERSTATE_H__ */

7
code/fgame/crc32.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2008 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// crc32.h: CRC32 Encryption (used by the Archiver) // crc32.h: CRC32 Encryption (used by the Archiver)
#ifndef __CRC32_H__ #pragma once
#define __CRC32_H8_
static unsigned int crc32_tab[] = { static unsigned int crc32_tab[] = {
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
@ -84,5 +83,3 @@ unsigned int crc32( unsigned int crc, const void *buf, size_t size )
return crc ^ ~0U; return crc ^ ~0U;
} }
#endif // __CRC32_H__

7
code/fgame/decals.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// decals.h: Decal entities // decals.h: Decal entities
#ifndef __DECAL_H__ #pragma once
#define __DECAL_H__
#include "g_local.h" #include "g_local.h"
#include "entity.h" #include "entity.h"
@ -57,5 +56,3 @@ inline void Decal::Archive
setShader( shader ); setShader( shader );
} }
} }
#endif // __DECAL_H__

7
code/fgame/earthquake.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -24,8 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// The earthquake effect is visible to the user as the shaking of his screen. // The earthquake effect is visible to the user as the shaking of his screen.
// //
#ifndef __EARTHQUAKE_H__ #pragma once
#define __EARTHQUAKE_H__
#include "g_local.h" #include "g_local.h"
#include "trigger.h" #include "trigger.h"
@ -75,5 +74,3 @@ inline void ViewJitter::Archive
arc.ArchiveBoolean( &m_bDoneDeath ); arc.ArchiveBoolean( &m_bDoneDeath );
arc.ArchiveFloat( &m_fTimeRunning ); arc.ArchiveFloat( &m_fTimeRunning );
} }
#endif

7
code/fgame/effectentity.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// actor.cpp: Base class for character AI. // actor.cpp: Base class for character AI.
#ifndef __EFFECTENTITY_H__ #pragma once
#define __EFFECTENTITY_H__
#include "animate.h" #include "animate.h"
@ -34,5 +33,3 @@ public:
EffectEntity(); EffectEntity();
}; };
#endif // __EFFECTENTITY_H__

7
code/fgame/explosion.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -26,8 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// explosions each time they are activated. // explosions each time they are activated.
// //
#ifndef __EXPLOSION_H__ #pragma once
#define __EXPLOSION_H__
#include "g_local.h" #include "g_local.h"
#include "entity.h" #include "entity.h"
@ -136,5 +135,3 @@ inline void ExplodeObject::Archive
arc.ArchiveInteger( &debrisamount ); arc.ArchiveInteger( &debrisamount );
debrismodels.Archive( arc ); debrismodels.Archive( arc );
} }
#endif /* explosion.h */

5
code/fgame/g_main.h
View file

@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// //
// g_main.h -- Global header file for g_main.cpp // g_main.h -- Global header file for g_main.cpp
#ifndef __G_MAIN_H__ #pragma once
#define __G_MAIN_H__
#include "g_local.h" #include "g_local.h"
#include "gamecvars.h" #include "gamecvars.h"
@ -55,5 +54,3 @@ void G_AllocGameData(void);
void G_DeAllocGameData(void); void G_DeAllocGameData(void);
void G_ClientDrawBoundingBoxes(void); void G_ClientDrawBoundingBoxes(void);
void G_ClientDrawTags(void); void G_ClientDrawTags(void);
#endif /* g_main.h */

7
code/fgame/g_phys.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2008 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// g_phys.h: Header for g_phys.cpp // g_phys.h: Header for g_phys.cpp
#ifndef __G_PHYS_H__ #pragma once
#define __G_PHYS_H__
#include "g_local.h" #include "g_local.h"
#include "vector.h" #include "vector.h"
@ -79,5 +78,3 @@ void G_Impact( Entity *e1, trace_t *trace );
qboolean G_PushMove( Entity *pusher, Vector move, Vector amove ); qboolean G_PushMove( Entity *pusher, Vector move, Vector amove );
void G_CheckWater( Entity *ent ); void G_CheckWater( Entity *ent );
Entity *G_TestEntityPosition( Entity *ent, Vector vOrg ); Entity *G_TestEntityPosition( Entity *ent, Vector vOrg );
#endif /* g_phys.h */

7
code/fgame/gibs.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// gibs.h: Gibs - nuff said // gibs.h: Gibs - nuff said
#ifndef __GIBS_H__ #pragma once
#define __GIBS_H__
#include "g_local.h" #include "g_local.h"
#include "mover.h" #include "mover.h"
@ -88,5 +87,3 @@ void CreateGibs
); );
extern Event EV_ThrowGib; extern Event EV_ThrowGib;
#endif // gibs.h

7
code/fgame/glb_local.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifndef __GLB_LOCAL_H__ #pragma once
#define __GLB_LOCAL_H__
#if defined( GAME_DLL ) #if defined( GAME_DLL )
@ -79,5 +78,3 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#endif #endif
#endif #endif
#endif /* glb_local.h */

7
code/fgame/gravpath.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// gravpath.h: Gravity path - Used for underwater currents and wells. // gravpath.h: Gravity path - Used for underwater currents and wells.
#ifndef __GRAVPATH_H__ #pragma once
#define __GRAVPATH_H__
#include "g_local.h" #include "g_local.h"
#include "class.h" #include "class.h"
@ -202,5 +201,3 @@ inline void GravPathManager::Archive
} }
extern GravPathManager gravPathManager; extern GravPathManager gravPathManager;
#endif /* gravpath.h */

7
code/fgame/grenadehint.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// grenadehint.h: Grenade hint for actors. // grenadehint.h: Grenade hint for actors.
#ifndef __GRENADEHINT_H__ #pragma once
#define __GRENADEHINT_H__
#include "g_local.h" #include "g_local.h"
#include "archive.h" #include "archive.h"
@ -53,5 +52,3 @@ inline void GrenadeHint::Archive
arc.ArchiveObjectPointer( ( Class ** )&m_pNext ); arc.ArchiveObjectPointer( ( Class ** )&m_pNext );
} }
#endif

7
code/fgame/health.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// health.h: Health powerup // health.h: Health powerup
// //
#ifndef __HEALTH_H__ #pragma once
#define __HEALTH_H__
#include "g_local.h" #include "g_local.h"
#include "item.h" #include "item.h"
@ -52,5 +51,3 @@ public:
private: private:
static SafePtr<Health> mHealthQueue[MAX_HEALTH_QUEUE]; static SafePtr<Health> mHealthQueue[MAX_HEALTH_QUEUE];
}; };
#endif /* health.h */

7
code/fgame/hud.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// hud.h: New HUD handler for MoHAA // hud.h: New HUD handler for MoHAA
// //
#ifndef __HUD_H__ #pragma once
#define __HUD_H__
#include "listener.h" #include "listener.h"
#include "container.h" #include "container.h"
@ -208,5 +207,3 @@ public:
}; };
extern Container< Hud * > hudElements; extern Container< Hud * > hudElements;
#endif /* __HUD_H__ */

7
code/fgame/huddraw.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// huddraw.cpp : This is a HudDraw Functions Code section with huddraw functions reversed for // huddraw.cpp : This is a HudDraw Functions Code section with huddraw functions reversed for
// altering clients HUD // altering clients HUD
#ifndef __HUDDRAW_H__ #pragma once
#define __HUDDRAW_H__
#include "g_local.h" #include "g_local.h"
@ -49,5 +48,3 @@ void iHudDrawAlpha( int cl_num, int info, float alpha );
void iHudDrawString( int cl_num, int info, const char *string ); void iHudDrawString( int cl_num, int info, const char *string );
void iHudDrawFont( int cl_num, int info, const char *fontName ); void iHudDrawFont( int cl_num, int info, const char *fontName );
void iHudDrawTimer( int cl_num, int index, float duration, float fade_out_time ); void iHudDrawTimer( int cl_num, int index, float duration, float fade_out_time );
#endif // __HUDDRAW_H__

7
code/fgame/inventoryitem.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// inventoryitem.h: Items that are visible in the player's inventory // inventoryitem.h: Items that are visible in the player's inventory
#ifndef __INVITEM_H__ #pragma once
#define __INVITEM_H__
#include "weapon.h" #include "weapon.h"
@ -52,5 +51,3 @@ class AntiSBJuice : public InventoryItem
void UseEvent( Event *ev ); void UseEvent( Event *ev );
}; };
#endif /* inventoryitem.h */

7
code/fgame/ipfilter.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -23,11 +23,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// ipfilter.h: DESCRIPTION: // ipfilter.h: DESCRIPTION:
// //
#ifndef __IPFILTER_H__ #pragma once
#define __IPFILTER_H__
#include "g_local.h" #include "g_local.h"
qboolean SV_FilterPacket( const char *from ); qboolean SV_FilterPacket( const char *from );
#endif /* !__IPFILTER_H__ */

7
code/fgame/light.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// light.h: Classes for creating and controlling lights. // light.h: Classes for creating and controlling lights.
// //
#ifndef __LIGHT_H__ #pragma once
#define __LIGHT_H__
#include "g_local.h" #include "g_local.h"
#include "entity.h" #include "entity.h"
@ -36,5 +35,3 @@ class Light : public Entity
Light(); Light();
}; };
#endif /* light.h */

7
code/fgame/mover.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -26,8 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// class size down for objects that don't need such behavior. // class size down for objects that don't need such behavior.
// //
#ifndef __MOVER_H__ #pragma once
#define __MOVER_H__
#include "g_local.h" #include "g_local.h"
#include "entity.h" #include "entity.h"
@ -64,5 +63,3 @@ inline void Mover::Archive
arc.ArchiveEventPointer( &endevent ); arc.ArchiveEventPointer( &endevent );
arc.ArchiveInteger( &moveflags ); arc.ArchiveInteger( &moveflags );
} }
#endif

7
code/fgame/playerbot.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2023 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -21,8 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
// playerbot.h: Multiplayer bot system. // playerbot.h: Multiplayer bot system.
#ifndef __PLAYERBOT_H__ #pragma once
#define __PLAYERBOT_H__
#include "player.h" #include "player.h"
#include "navigate.h" #include "navigate.h"
@ -178,5 +177,3 @@ public:
void GotKill(Event *ev); void GotKill(Event *ev);
void EventStuffText(Event *ev); void EventStuffText(Event *ev);
}; };
#endif /* playerbot.h */

7
code/fgame/playerstart.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// PlayerStart.h: Player start location entity declarations // PlayerStart.h: Player start location entity declarations
// //
#ifndef __PLAYERSTART_H__ #pragma once
#define __PLAYERSTART_H__
#include "g_local.h" #include "g_local.h"
#include "simpleentity.h" #include "simpleentity.h"
@ -89,5 +88,3 @@ class PlayerIntermission : public Camera
CLASS_PROTOTYPE( PlayerIntermission ); CLASS_PROTOTYPE( PlayerIntermission );
PlayerIntermission(); PlayerIntermission();
}; };
#endif /* PlayerStart.h */

8
code/fgame/portal.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// portal.h: // portal.h:
// //
#ifndef __PORTAL_H__ #pragma once
#define __PORTAL_H__
#include "g_local.h" #include "g_local.h"
#include "entity.h" #include "entity.h"
@ -45,6 +44,3 @@ class PortalCamera : public Entity
PortalCamera(); PortalCamera();
void Roll( Event *ev ); void Roll( Event *ev );
}; };
#endif // __PORTAL_H__

7
code/fgame/scripttimer.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// ScriptTimer.cpp: Scripted Timer & Fader // ScriptTimer.cpp: Scripted Timer & Fader
// //
#ifndef __SCRIPTTIMER_H__ #pragma once
#define __SCRIPTTIMER_H__
#include "listener.h" #include "listener.h"
@ -81,5 +80,3 @@ public:
bool isEnabled(); bool isEnabled();
void setType( timertype_e type ); void setType( timertype_e type );
}; };
#endif /* __SCRIPTTIMER_H__ */

7
code/fgame/soundman.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// soundman.h: Sound Manager // soundman.h: Sound Manager
// //
#ifndef __SOUND_MANAGER_H__ #pragma once
#define __SOUND_MANAGER_H__
#include "g_local.h" #include "g_local.h"
#include "entity.h" #include "entity.h"
@ -110,5 +109,3 @@ inline void SoundManager::Archive
} }
extern SoundManager SoundMan; extern SoundManager SoundMan;
#endif /* camera.h */

7
code/fgame/specialfx.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// specialfx.h: special effects // specialfx.h: special effects
// //
#ifndef __SPECIAL_FX_H__ #pragma once
#define __SPECIAL_FX_H__
#include "g_local.h" #include "g_local.h"
#include "scriptslave.h" #include "scriptslave.h"
@ -174,5 +173,3 @@ inline void SinkObject::Archive
arc.ArchiveBoolean( &active ); arc.ArchiveBoolean( &active );
arc.ArchiveVector( &startpos ); arc.ArchiveVector( &startpos );
} }
#endif /* specialfx.h */

7
code/fgame/stack.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// stack.h: Generic Stack object. // stack.h: Generic Stack object.
// //
#ifndef __STACK_H__ #pragma once
#define __STACK_H__
#include "g_local.h" #include "g_local.h"
#include "class.h" #include "class.h"
@ -142,5 +141,3 @@ inline Type Stack<Type>::Pop
return ret; return ret;
} }
#endif /* stack.h */

7
code/fgame/umap.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -24,8 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// stored data. // stored data.
// //
#ifndef __UMAP_H__ #pragma once
#define __UMAP_H__
#include "str.h" #include "str.h"
#include <stdlib.h> #include <stdlib.h>
@ -335,5 +334,3 @@ inline unsigned UMap<Type>::getNumEntries
{ {
return m_numentries; return m_numentries;
} }
#endif /* !__UMAP_H__ */

7
code/fgame/viewthing.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// viewthing.h: Actor code for the viewthing. // viewthing.h: Actor code for the viewthing.
// //
#ifndef __VIEWTHING_H__ #pragma once
#define __VIEWTHING_H__
#include "animate.h" #include "animate.h"
@ -113,5 +112,3 @@ inline void Viewthing::Archive
arc.ArchiveVector( &baseorigin ); arc.ArchiveVector( &baseorigin );
arc.ArchiveRaw( origSurfaces, sizeof( origSurfaces ) ); arc.ArchiveRaw( origSurfaces, sizeof( origSurfaces ) );
} }
#endif /* viewthing.h */

7
code/fgame/weapon.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -25,8 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// class will be usable by any Sentient (players and monsters) as a weapon. // class will be usable by any Sentient (players and monsters) as a weapon.
// //
#ifndef __WEAPON_H__ #pragma once
#define __WEAPON_H__
#include "g_local.h" #include "g_local.h"
#include "item.h" #include "item.h"
@ -620,5 +619,3 @@ inline void Weapon::Archive(Archiver& arc)
} }
typedef SafePtr<Weapon> WeaponPtr; typedef SafePtr<Weapon> WeaponPtr;
#endif /* weapon.h */

7
code/fgame/weaputils.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// weaputils.h: // weaputils.h:
// //
#ifndef __WEAPUTILS_H__ #pragma once
#define __WEAPUTILS_H__
#include "g_local.h" #include "g_local.h"
#include "animate.h" #include "animate.h"
@ -361,5 +360,3 @@ Entity* FindDefusableObject(const Vector& dir, Entity* owner, float maxdist);
void DefuseObject(const Vector& dir, Entity* owner, float maxdist); void DefuseObject(const Vector& dir, Entity* owner, float maxdist);
qboolean CanPlaceLandmine(const Vector& origin, Entity* owner); qboolean CanPlaceLandmine(const Vector& origin, Entity* owner);
void PlaceLandmine(const Vector& origin, Entity* owner, const str& model, Weapon* weap); void PlaceLandmine(const Vector& origin, Entity* owner, const str& model, Weapon* weap);
#endif // __WEAPUTILS_H__

7
code/uilib/ucolor.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifndef __UCOLOR_H__ #pragma once
#define __UCOLOR_H__
class UColor { class UColor {
public: public:
@ -85,5 +84,3 @@ extern UColor ULightGreen;
extern UColor UBlue; extern UColor UBlue;
extern UColor UYellow; extern UColor UYellow;
extern UColor UHudColor; extern UColor UHudColor;
#endif /* __UCOLOR_H__ */

8
code/uilib/ui_extern.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifndef __UI_EXTERN_H__ #pragma once
#define __UI_EXTERN_H__
#include "../qcommon/q_shared.h" #include "../qcommon/q_shared.h"
#include "../qcommon/qcommon.h" #include "../qcommon/qcommon.h"
@ -83,6 +82,3 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "../client/cl_invrender.h" #include "../client/cl_invrender.h"
#include "../client/cl_uistd.h" #include "../client/cl_uistd.h"
#include "../client/cl_uiloadsave.h" #include "../client/cl_uiloadsave.h"
#endif /* __UI_EXTERN_H__ */

8
code/uilib/ui_local.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifndef __UI_LOCAL_H__ #pragma once
#define __UI_LOCAL_H__
#include "../client/cl_ui.h" #include "../client/cl_ui.h"
@ -32,6 +31,3 @@ typedef struct uiGlobals_s {
} uiGlobals_t; } uiGlobals_t;
extern uiGlobals_t ui; extern uiGlobals_t ui;
#endif /* __UI_LOCAL_H__ */

7
code/uilib/uibutton.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifndef __UIBUTTON_H__ #pragma once
#define __UIBUTTON_H__
extern Event W_Button_Pressed; extern Event W_Button_Pressed;
@ -102,5 +101,3 @@ public:
void setCommand( const char *cmd ); void setCommand( const char *cmd );
void setButton( UIButton *button ); void setButton( UIButton *button );
}; };
#endif

8
code/uilib/uicheckbox.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifndef __UICHECKBOX_H__ #pragma once
#define __UICHECKBOX_H__
class UICheckBox : public UIWidget { class UICheckBox : public UIWidget {
str m_checked_command; str m_checked_command;
@ -60,6 +59,3 @@ extern Event EV_UICheckBox_SetCheckedCommand;
extern Event EV_UICheckBox_SetUncheckedCommand; extern Event EV_UICheckBox_SetUncheckedCommand;
extern Event EV_UICheckBox_SetCheckedShader; extern Event EV_UICheckBox_SetCheckedShader;
extern Event EV_UICheckBox_SetUncheckedShader; extern Event EV_UICheckBox_SetUncheckedShader;
#endif

7
code/uilib/uiconsole.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifndef __UI_CONSOLE_H__ #pragma once
#define __UI_CONSOLE_H__
typedef void ( *consoleHandler_t )( const char *text ); typedef void ( *consoleHandler_t )( const char *text );
@ -172,5 +171,3 @@ public:
int GetMessageMode( void ); int GetMessageMode( void );
void SetMessageMode( int iMode ); void SetMessageMode( int iMode );
}; };
#endif

7
code/uilib/uifloatwnd.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifndef __UI_FLOATWND_H__ #pragma once
#define __UI_FLOATWND_H__
class UIChildSpaceWidget : public UIWidget { class UIChildSpaceWidget : public UIWidget {
public: public:
@ -78,5 +77,3 @@ public:
}; };
static UColor UWindowColor(0.15f, 0.195f, 0.278f, 1); static UColor UWindowColor(0.15f, 0.195f, 0.278f, 1);
#endif

7
code/uilib/uilayout.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifndef __UILAYOUT_H__ #pragma once
#define __UILAYOUT_H__
class Script; class Script;
@ -48,5 +47,3 @@ public:
void Load( const char *filename, bool bFullLoad ); void Load( const char *filename, bool bFullLoad );
int ForceLoad( void ); int ForceLoad( void );
}; };
#endif

7
code/uilib/uilist.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifndef __UILIST_H__ #pragma once
#define __UILIST_H__
class UIListItem { class UIListItem {
public: public:
@ -71,5 +70,3 @@ public:
qboolean KeyEvent( int key, unsigned int time ) override; qboolean KeyEvent( int key, unsigned int time ) override;
}; };
#endif /* __UILIST_H__ */

7
code/uilib/uilistctrl.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifndef __UILISTCTRL_H__ #pragma once
#define __UILISTCTRL_H__
typedef enum { TYPE_STRING, TYPE_OWNERDRAW } griditemtype_t; typedef enum { TYPE_STRING, TYPE_OWNERDRAW } griditemtype_t;
@ -105,5 +104,3 @@ public:
void setCompareFunction( int( *func ) ( const UIListCtrlItem *i1, const UIListCtrlItem *i2, int columnname ) ); void setCompareFunction( int( *func ) ( const UIListCtrlItem *i1, const UIListCtrlItem *i2, int columnname ) );
void setHeaderFont( const char *name ); void setHeaderFont( const char *name );
}; };
#endif

8
code/uilib/uimenu.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifndef __UIMENU_H__ #pragma once
#define __UIMENU_H__
#include "../qcommon/listener.h" #include "../qcommon/listener.h"
#include "../qcommon/stack.h" #include "../qcommon/stack.h"
@ -108,6 +107,3 @@ extern Event EV_LockMenus;
extern Event EV_UnlockMenus; extern Event EV_UnlockMenus;
extern Event EV_ShowMenu; extern Event EV_ShowMenu;
extern Event EV_HideMenu; extern Event EV_HideMenu;
#endif

8
code/uilib/uinotepad.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015-2024 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifndef __UINOTEPAD_H__ #pragma once
#define __UINOTEPAD_H__
class UINotepad; class UINotepad;
@ -103,6 +102,3 @@ public:
}; };
bool UI_LoadNotepadFile( const char *filename ); bool UI_LoadNotepadFile( const char *filename );
#endif

7
code/uilib/uipoint2d.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifndef __UIPOINT2D_H__ #pragma once
#define __UIPOINT2D_H__
class UIPoint2D { class UIPoint2D {
public: public:
@ -64,5 +63,3 @@ bool UIPoint2D::operator!=( const UIPoint2D& pos ) const
{ {
return ( x != pos.x || y != pos.y ); return ( x != pos.x || y != pos.y );
} }
#endif /* __UIPOINT2D_H__ */

8
code/uilib/uipopupmenu.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2023 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifndef __UIPOPUPMENU_H__ #pragma once
#define __UIPOPUPMENU_H__
typedef enum { UIP_NONE, UIP_EVENT, UIP_EVENT_STRING, UIP_SUBMENU, UIP_CMD, UIP_CVAR, UIP_SEPARATOR } uipopup_type; typedef enum { UIP_NONE, UIP_EVENT, UIP_EVENT_STRING, UIP_SUBMENU, UIP_CMD, UIP_CVAR, UIP_SEPARATOR } uipopup_type;
typedef enum { UIP_WHERE_RIGHT, UIP_WHERE_DOWN } uipopup_where; typedef enum { UIP_WHERE_RIGHT, UIP_WHERE_DOWN } uipopup_where;
@ -133,6 +132,3 @@ public:
}; };
uipopup_type UI_PopupTypeStringToInt(str type); uipopup_type UI_PopupTypeStringToInt(str type);
#endif

8
code/uilib/uipulldownmenu.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2023 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifndef __UIPULLDOWNMENU_H__ #pragma once
#define __UIPULLDOWNMENU_H__
class uipull_describe { class uipull_describe {
public: public:
@ -102,6 +101,3 @@ public:
void Realign( void ) override; void Realign( void ) override;
void Draw( void ) override; void Draw( void ) override;
}; };
#endif

8
code/uilib/uipulldownmenucontainer.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifndef __UIPULLDOWNMENUCONTAINER_H__ #pragma once
#define __UIPULLDOWNMENUCONTAINER_H__
class UIPulldownMenuContainer : public UIWidget { class UIPulldownMenuContainer : public UIWidget {
protected: protected:
@ -54,6 +53,3 @@ protected:
public: public:
void AddPopup( Event *ev ); void AddPopup( Event *ev );
}; };
#endif

7
code/uilib/uisize2d.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifndef __UISIZE2D_H__ #pragma once
#define __UISIZE2D_H__
class UISize2D { class UISize2D {
public: public:
@ -65,5 +64,3 @@ bool UISize2D::operator!=( const UISize2D& pos ) const
{ {
return ( width != pos.width || height != pos.height ); return ( width != pos.width || height != pos.height );
} }
#endif /* __UISIZE2D_H__ */

8
code/uilib/uislider.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifndef __UISLIDER_H__ #pragma once
#define __UISLIDER_H__
typedef enum { SLIDER_FLOAT, SLIDER_INTEGER } slidertype_t; typedef enum { SLIDER_FLOAT, SLIDER_INTEGER } slidertype_t;
@ -85,6 +84,3 @@ public:
void setRange( float min, float max ); void setRange( float min, float max );
void setStep( float value ); void setStep( float value );
}; };
#endif

8
code/uilib/uistatus.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifndef __UISTATUS_H__ #pragma once
#define __UISTATUS_H__
typedef enum { M_NONE, M_DRAGGING } mouseState_t; typedef enum { M_NONE, M_DRAGGING } mouseState_t;
@ -79,6 +78,3 @@ public:
void ParentSized( Event *ev ); void ParentSized( Event *ev );
void SelfSized( Event *ev ); void SelfSized( Event *ev );
}; };
#endif

7
code/uilib/uivertscroll.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifndef __UIVERTSCROLL_H__ #pragma once
#define __UIVERTSCROLL_H__
class unnamed_struct { class unnamed_struct {
public: public:
@ -73,5 +72,3 @@ public:
void InitFrameAlignRight( UIWidget *parent, float fWidthPadding, float fHeightPadding ); void InitFrameAlignRight( UIWidget *parent, float fWidthPadding, float fHeightPadding );
}; };
#endif

7
code/uilib/ulist.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2024 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.
@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifndef __ULIST_H__ #pragma once
#define __ULIST_H__
template< typename type > template< typename type >
class UListItem { class UListItem {
@ -349,5 +348,3 @@ void UList< type >::setPosition
{ {
m_at = static_cast<UListItem<type>*>(pos); m_at = static_cast<UListItem<type>*>(pos);
} }
#endif /* __ULIST_H__ */