From 4960b5d4e1f58b277b30db9c4410ee6bb0a070f1 Mon Sep 17 00:00:00 2001 From: Benjamen Meyer <bm_witness@yahoo.com> Date: Sat, 27 May 2023 02:00:01 -0400 Subject: [PATCH 1/4] Enhancement: Uniform Header Guards - Updated all headers to reflect a common header guard format - Added comments when there are no header guards so it can be tracked --- engine/launcher/general.h | 6 +- engine/mission/include/central.h | 8 +-- engine/mission/include/display_gtk.h | 8 +-- engine/mission/include/easydom.h | 6 +- engine/mission/include/file.h | 8 +-- engine/mission/include/general.h | 8 +-- engine/mission/include/hashtable.h | 8 +-- engine/mission/include/xml_support.h | 8 +-- engine/objconv/basemaker/base_maker_texture.h | 1 + engine/objconv/basemaker/sprite.h | 7 +-- engine/objconv/mesher/Converter.h | 8 +-- .../mesher/PrecompiledHeaders/Converter.h | 1 + .../mesher/PrecompiledHeaders/Standard.h | 8 +-- engine/objconv/mesher/expat.h | 1 + engine/objconv/mesher/from_BFXM.h | 1 + engine/objconv/mesher/from_obj.h | 1 + engine/objconv/mesher/mesh.h | 8 +-- engine/objconv/mesher/mesh_io.h | 1 + engine/objconv/mesher/to_BFXM.h | 7 +-- engine/objconv/mesher/to_OgreMesh.h | 8 +-- engine/objconv/mesher/to_obj.h | 3 +- engine/objconv/trisort.h | 1 + engine/setup/src/include/central.h | 8 +-- engine/setup/src/include/display.h | 6 +- .../src/include/dont_link/display_console.h | 6 +- engine/setup/src/include/file.h | 6 +- engine/setup/src/include/general.h | 9 +-- engine/src/SharedPool.h | 7 +-- engine/src/Singleton.h | 7 +-- engine/src/XMLDocument.h | 7 +-- engine/src/abstract_config.h | 7 +-- engine/src/aldrv/al_globals.h | 9 +-- engine/src/atmospheric_fog_mesh.h | 7 +-- engine/src/audio/CodecRegistry.h | 7 +-- engine/src/audio/Exceptions.h | 7 +-- engine/src/audio/Format.h | 8 +-- engine/src/audio/Listener.h | 7 +-- engine/src/audio/Matrix.h | 7 +-- engine/src/audio/RenderableListener.h | 7 +-- engine/src/audio/RenderableSource.h | 7 +-- engine/src/audio/Renderer.h | 7 +-- engine/src/audio/Scene.h | 7 +-- engine/src/audio/SceneManager.h | 7 +-- engine/src/audio/SimpleScene.h | 7 +-- engine/src/audio/SimpleSound.h | 7 +-- engine/src/audio/SimpleSource.h | 7 +-- engine/src/audio/Sound.h | 7 +-- engine/src/audio/SoundBuffer.h | 8 +-- engine/src/audio/Source.h | 7 +-- engine/src/audio/SourceListener.h | 7 +-- engine/src/audio/SourceTemplate.h | 7 +-- engine/src/audio/Stream.h | 7 +-- engine/src/audio/Types.h | 7 +-- engine/src/audio/Vector.h | 7 +-- engine/src/audio/VirtualIterator.h | 8 +-- engine/src/audio/codecs/Codec.h | 7 +-- engine/src/audio/codecs/FFCodec.h | 7 +-- engine/src/audio/codecs/FFStream.h | 9 ++- engine/src/audio/codecs/OggCodec.h | 7 +-- engine/src/audio/codecs/OggData.h | 2 +- engine/src/audio/codecs/OggStream.h | 9 ++- .../renderers/OpenAL/BorrowedOpenALRenderer.h | 7 +-- .../audio/renderers/OpenAL/OpenALHelpers.h | 8 +-- .../OpenAL/OpenALRenderableListener.h | 7 +-- .../renderers/OpenAL/OpenALRenderableSource.h | 7 +-- .../OpenAL/OpenALRenderableStreamingSource.h | 7 +-- .../audio/renderers/OpenAL/OpenALRenderer.h | 7 +-- .../renderers/OpenAL/OpenALSimpleSound.h | 7 +-- .../renderers/OpenAL/OpenALStreamingSound.h | 7 +-- engine/src/audio/renderers/OpenAL/al.h | 9 +-- engine/src/audio/test.h | 7 +-- engine/src/audio/utils.h | 9 +-- engine/src/audiolib.h | 6 +- engine/src/cg_global.h | 14 ++--- engine/src/cmd/ai/aggressive.h | 8 +-- engine/src/cmd/ai/autodocking.h | 11 ++-- engine/src/cmd/ai/comm_ai.h | 9 +-- engine/src/cmd/ai/communication.h | 8 +-- engine/src/cmd/ai/docking.h | 2 +- engine/src/cmd/ai/event_xml.h | 7 +-- engine/src/cmd/ai/fire.h | 7 +-- engine/src/cmd/ai/fireall.h | 2 +- engine/src/cmd/ai/firekeyboard.h | 8 +-- engine/src/cmd/ai/flybywire.h | 7 +-- engine/src/cmd/ai/flyjoystick.h | 2 +- engine/src/cmd/ai/flykeyboard.h | 8 +-- engine/src/cmd/ai/hard_coded_scripts.h | 8 +-- engine/src/cmd/ai/ikarus.h | 8 +-- engine/src/cmd/ai/missionscript.h | 8 +-- engine/src/cmd/ai/navigation.h | 8 +-- engine/src/cmd/ai/order.h | 10 +--- engine/src/cmd/ai/pythonai.h | 3 +- engine/src/cmd/ai/script.h | 8 +-- engine/src/cmd/ai/tactics.h | 8 +-- engine/src/cmd/ai/turretai.h | 7 +-- engine/src/cmd/ai/warpto.h | 2 +- engine/src/cmd/alphacurve.h | 8 +-- engine/src/cmd/armed.h | 8 +-- engine/src/cmd/asteroid.h | 7 +-- engine/src/cmd/atmosphere.h | 2 +- engine/src/cmd/audible.h | 7 +-- engine/src/cmd/base.h | 8 +-- engine/src/cmd/base_util.h | 8 +-- engine/src/cmd/basecomputer.h | 9 +-- engine/src/cmd/beam.h | 8 +-- engine/src/cmd/bolt.h | 7 +-- engine/src/cmd/briefing.h | 2 +- engine/src/cmd/building.h | 9 +-- engine/src/cmd/cargo.h | 8 +-- engine/src/cmd/carrier.h | 8 +-- engine/src/cmd/click_list.h | 9 +-- engine/src/cmd/collection.h | 9 +-- engine/src/cmd/collide.h | 9 +-- engine/src/cmd/collide2/CSopcodecollider.h | 6 +- engine/src/cmd/collide2/Ice/IceAABB.h | 6 +- engine/src/cmd/collide2/Ice/IceAxes.h | 6 +- .../src/cmd/collide2/Ice/IceBoundingSphere.h | 6 +- engine/src/cmd/collide2/Ice/IceContainer.h | 6 +- engine/src/cmd/collide2/Ice/IceFPU.h | 6 +- engine/src/cmd/collide2/Ice/IceHPoint.h | 7 +-- .../src/cmd/collide2/Ice/IceIndexedTriangle.h | 6 +- engine/src/cmd/collide2/Ice/IceLSS.h | 6 +- engine/src/cmd/collide2/Ice/IceMatrix3x3.h | 7 +-- engine/src/cmd/collide2/Ice/IceMatrix4x4.h | 7 +-- engine/src/cmd/collide2/Ice/IceMemoryMacros.h | 6 +- engine/src/cmd/collide2/Ice/IceOBB.h | 6 +- engine/src/cmd/collide2/Ice/IcePairs.h | 6 +- engine/src/cmd/collide2/Ice/IcePlane.h | 6 +- engine/src/cmd/collide2/Ice/IcePoint.h | 6 +- engine/src/cmd/collide2/Ice/IcePreprocessor.h | 6 +- engine/src/cmd/collide2/Ice/IceRandom.h | 7 +-- engine/src/cmd/collide2/Ice/IceRay.h | 6 +- .../src/cmd/collide2/Ice/IceRevisitedRadix.h | 6 +- engine/src/cmd/collide2/Ice/IceSegment.h | 6 +- engine/src/cmd/collide2/Ice/IceTriangle.h | 6 +- engine/src/cmd/collide2/Ice/IceTrilist.h | 6 +- engine/src/cmd/collide2/Ice/IceTypes.h | 6 +- engine/src/cmd/collide2/Ice/IceUtils.h | 6 +- engine/src/cmd/collide2/Ice/Stdafx.h | 1 + engine/src/cmd/collide2/OPC_AABBCollider.h | 6 +- engine/src/cmd/collide2/OPC_AABBTree.h | 6 +- engine/src/cmd/collide2/OPC_BaseModel.h | 6 +- engine/src/cmd/collide2/OPC_BoxBoxOverlap.h | 1 + engine/src/cmd/collide2/OPC_BoxPruning.h | 6 +- engine/src/cmd/collide2/OPC_Collider.h | 6 +- engine/src/cmd/collide2/OPC_Common.h | 6 +- engine/src/cmd/collide2/OPC_HybridModel.h | 6 +- engine/src/cmd/collide2/OPC_IceHook.h | 1 + engine/src/cmd/collide2/OPC_LSSAABBOverlap.h | 1 + engine/src/cmd/collide2/OPC_LSSCollider.h | 6 +- engine/src/cmd/collide2/OPC_LSSTriOverlap.h | 1 + engine/src/cmd/collide2/OPC_MeshInterface.h | 6 +- engine/src/cmd/collide2/OPC_Model.h | 6 +- engine/src/cmd/collide2/OPC_OBBCollider.h | 6 +- engine/src/cmd/collide2/OPC_OptimizedTree.h | 6 +- engine/src/cmd/collide2/OPC_Picking.h | 6 +- .../src/cmd/collide2/OPC_PlanesAABBOverlap.h | 1 + engine/src/cmd/collide2/OPC_PlanesCollider.h | 6 +- .../src/cmd/collide2/OPC_PlanesTriOverlap.h | 1 + engine/src/cmd/collide2/OPC_RayAABBOverlap.h | 1 + engine/src/cmd/collide2/OPC_RayCollider.h | 6 +- engine/src/cmd/collide2/OPC_RayTriOverlap.h | 1 + engine/src/cmd/collide2/OPC_Settings.h | 6 +- .../src/cmd/collide2/OPC_SphereAABBOverlap.h | 1 + engine/src/cmd/collide2/OPC_SphereCollider.h | 6 +- .../src/cmd/collide2/OPC_SphereTriOverlap.h | 1 + engine/src/cmd/collide2/OPC_SweepAndPrune.h | 6 +- engine/src/cmd/collide2/OPC_TreeBuilders.h | 6 +- engine/src/cmd/collide2/OPC_TreeCollider.h | 6 +- engine/src/cmd/collide2/OPC_TriBoxOverlap.h | 1 + engine/src/cmd/collide2/OPC_TriTriOverlap.h | 2 +- engine/src/cmd/collide2/OPC_VolumeCollider.h | 6 +- engine/src/cmd/collide2/Opcode.h | 6 +- engine/src/cmd/collide2/Stdafx.h | 7 +-- engine/src/cmd/collide2/basecollider.h | 9 +-- engine/src/cmd/collide2/csgeom2/opbox.h | 8 +-- engine/src/cmd/collide2/csgeom2/opmath.h | 8 +-- engine/src/cmd/collide2/csgeom2/opmatrix3.h | 8 +-- engine/src/cmd/collide2/csgeom2/optransfrm.h | 8 +-- engine/src/cmd/collide2/csgeom2/opvector3.h | 6 +- engine/src/cmd/collide2/opcodealgorithms.h | 7 +-- engine/src/cmd/collide2/opcodeextern.h | 6 +- engine/src/cmd/collide2/opcodegarray.h | 7 +-- engine/src/cmd/collide2/opcodeqint.h | 7 +-- engine/src/cmd/collide2/opcodeqsqrt.h | 6 +- engine/src/cmd/collide2/opcodesysdef.h | 8 +-- engine/src/cmd/collide2/opcodetypes.h | 7 +-- engine/src/cmd/collide2/segmentcell.h | 2 +- engine/src/cmd/collide_map.h | 7 +-- engine/src/cmd/collision.h | 8 +-- engine/src/cmd/computer.h | 7 +-- engine/src/cmd/cont_terrain.h | 2 +- engine/src/cmd/container.h | 9 +-- engine/src/cmd/csv.h | 2 +- engine/src/cmd/damageable.h | 8 +-- engine/src/cmd/drawable.h | 8 +-- engine/src/cmd/energetic.h | 8 +-- engine/src/cmd/engineVersion.h | 8 +-- engine/src/cmd/enhancement.h | 8 +-- engine/src/cmd/faction_factory.h | 7 +-- engine/src/cmd/fg_util.h | 2 +- engine/src/cmd/images.h | 9 +-- engine/src/cmd/intelligent.h | 7 +-- engine/src/cmd/json.h | 6 +- engine/src/cmd/jump_capable.h | 8 +-- engine/src/cmd/key_mutable_set.h | 9 +-- engine/src/cmd/missile.h | 9 +-- engine/src/cmd/mount.h | 8 +-- engine/src/cmd/mount_size.h | 8 +-- engine/src/cmd/movable.h | 8 +-- engine/src/cmd/music.h | 8 +-- engine/src/cmd/nebula.h | 9 +-- engine/src/cmd/oldcollection.h | 8 +-- engine/src/cmd/pilot.h | 2 +- engine/src/cmd/planet.h | 8 +-- engine/src/cmd/planetary_orbit.h | 8 +-- engine/src/cmd/role_bitmask.h | 9 +-- engine/src/cmd/script/c_alike/c_alike.h | 1 + .../src/cmd/script/c_alike/c_alike.tab.cpp.h | 2 + engine/src/cmd/script/flightgroup.h | 8 +-- engine/src/cmd/script/mission.h | 8 +-- engine/src/cmd/script/mission_types.h | 8 +-- engine/src/cmd/script/msgcenter.h | 10 +--- engine/src/cmd/script/pythonmission.h | 10 ++-- engine/src/cmd/terrain.h | 8 +-- engine/src/cmd/testcollection/unit.h | 7 +-- engine/src/cmd/turret.h | 8 +-- engine/src/cmd/unit_click.h | 9 +-- engine/src/cmd/unit_collide.h | 9 +-- engine/src/cmd/unit_const_cache.h | 7 +-- engine/src/cmd/unit_csv.h | 9 +-- engine/src/cmd/unit_csv_factory.h | 8 +-- engine/src/cmd/unit_customize.h | 9 +-- engine/src/cmd/unit_find.h | 8 +-- engine/src/cmd/unit_generic.h | 14 ++--- engine/src/cmd/unit_json_factory.h | 7 +-- engine/src/cmd/unit_optimize_factory.h | 7 +-- engine/src/cmd/unit_physics.h | 8 +-- engine/src/cmd/unit_type.h | 7 +-- engine/src/cmd/unit_util.h | 8 +-- engine/src/cmd/unit_xml.h | 9 +-- engine/src/cmd/upgradeable_unit.h | 10 ++-- engine/src/cmd/vs_limits.h | 8 +-- engine/src/cmd/weapon_factory.h | 8 +-- engine/src/cmd/weapon_info.h | 8 +-- engine/src/cmd/weapon_type.h | 8 +-- engine/src/command.h | 8 +-- engine/src/common/common.h | 2 +- engine/src/config_xml.h | 8 +-- engine/src/configuration/configuration.h | 6 +- engine/src/configuration/game_config.h | 8 +-- engine/src/configxml.h | 7 +-- engine/src/damage/core_vector.h | 10 ++-- engine/src/damage/damage.h | 8 +-- engine/src/damage/damageable_layer.h | 8 +-- engine/src/damage/damageable_object.h | 8 +-- engine/src/damage/facet_configuration.h | 8 +-- engine/src/damage/health.h | 8 +-- engine/src/debug_vs.h | 23 ++++---- engine/src/easydom.h | 8 +-- engine/src/endianness.h | 34 +++++------ engine/src/faction_generic.h | 6 +- engine/src/ffmpeg_init.h | 57 ++++++++++--------- engine/src/file_main.h | 6 +- engine/src/force_feedback.h | 20 +++---- engine/src/functors.h | 8 ++- engine/src/galaxy.h | 7 +-- engine/src/galaxy_gen.h | 7 +-- engine/src/galaxy_xml.h | 9 ++- engine/src/gamemenu.h | 7 +-- engine/src/gfx/aligned.h | 8 +-- engine/src/gfx/ani_texture.h | 9 +-- engine/src/gfx/animation.h | 9 +-- engine/src/gfx/aux_logo.h | 9 +-- engine/src/gfx/aux_palette.h | 7 +-- engine/src/gfx/aux_texture.h | 8 +-- engine/src/gfx/background.h | 9 +-- engine/src/gfx/boltdrawmanager.h | 8 +-- engine/src/gfx/camera.h | 8 +-- engine/src/gfx/car_assist.h | 2 +- engine/src/gfx/cockpit.h | 8 +-- engine/src/gfx/cockpit_generic.h | 7 +-- engine/src/gfx/cockpit_gfx.h | 8 +-- engine/src/gfx/cockpit_gfx_utils.h | 9 +-- engine/src/gfx/coord_select.h | 2 +- engine/src/gfx/decalqueue.h | 2 +- engine/src/gfx/env_map_gent.h | 9 +-- engine/src/gfx/gauge.h | 2 +- engine/src/gfx/halo.h | 9 +-- engine/src/gfx/halo_system.h | 8 +-- engine/src/gfx/hud.h | 9 +-- engine/src/gfx/jpeg_memory.cpp | 6 +- engine/src/gfx/jpeg_memory.h | 19 ++++--- engine/src/gfx/lerp.h | 9 +-- engine/src/gfx/loc_select.h | 2 +- engine/src/gfx/masks.h | 9 +-- engine/src/gfx/matrix.h | 8 +-- engine/src/gfx/mesh.h | 9 +-- engine/src/gfx/mesh_bxm.h | 2 +- engine/src/gfx/mesh_io.h | 9 +-- engine/src/gfx/mesh_xml.h | 10 +--- engine/src/gfx/nav/criteria.h | 9 +-- engine/src/gfx/nav/drawlist.h | 9 +-- engine/src/gfx/nav/navcomputer.h | 9 +-- engine/src/gfx/nav/navgetxmldata.h | 9 +-- engine/src/gfx/nav/navitemstodraw.h | 2 +- engine/src/gfx/nav/navitemtypes.h | 9 +-- engine/src/gfx/nav/navparse.h | 2 +- engine/src/gfx/nav/navpath.h | 9 +-- engine/src/gfx/nav/navscreen.h | 9 +-- engine/src/gfx/nav/navscreenoccupied.h | 8 +-- engine/src/gfx/nonlinear_transform.h | 7 +-- engine/src/gfx/occlusion.h | 8 +-- engine/src/gfx/particle.h | 9 +-- engine/src/gfx/pass.h | 8 +-- engine/src/gfx/pipelined_texture.h | 9 +-- engine/src/gfx/point_to_cam.h | 9 +-- engine/src/gfx/quadsquare.h | 9 +-- engine/src/gfx/quadtree.h | 8 +-- engine/src/gfx/quaternion.h | 9 +-- engine/src/gfx/radar/bubble_display.h | 9 +-- engine/src/gfx/radar/dual_display.h | 9 +-- engine/src/gfx/radar/null_display.h | 9 +-- engine/src/gfx/radar/plane_display.h | 9 +-- engine/src/gfx/radar/radar.h | 9 +-- engine/src/gfx/radar/sensor.h | 6 +- engine/src/gfx/radar/sphere_display.h | 9 +-- engine/src/gfx/radar/track.h | 9 +-- engine/src/gfx/radar/viewarea.h | 9 +-- engine/src/gfx/ring.h | 7 +-- engine/src/gfx/screenshot.h | 9 +-- engine/src/gfx/soundcontainer.h | 9 +-- engine/src/gfx/soundcontainer_aldrv.h | 9 +-- engine/src/gfx/soundcontainer_generic.h | 9 +-- engine/src/gfx/sphere.h | 8 +-- engine/src/gfx/sprite.h | 9 +-- engine/src/gfx/star.h | 8 +-- engine/src/gfx/stream_texture.h | 2 +- engine/src/gfx/technique.h | 9 +-- engine/src/gfx/texture_manager.h | 8 +-- engine/src/gfx/tvector.h | 9 ++- engine/src/gfx/vdu.h | 8 +-- engine/src/gfx/vec.h | 8 +-- engine/src/gfx/vectorizable.h | 9 +-- engine/src/gfx/vertex.h | 9 +-- engine/src/gfx/vid_file.h | 9 +-- engine/src/gfx/vsbox.h | 9 +-- engine/src/gfx/vsimage.h | 9 +-- engine/src/gfx/warptrail.h | 9 +-- engine/src/gfxlib.h | 22 ++++--- engine/src/gfxlib_struct.h | 11 ++-- engine/src/gldrv/gl_globals.h | 16 +++--- engine/src/gldrv/gl_include.h | 8 +-- engine/src/gldrv/gl_init.h | 8 +-- engine/src/gldrv/gl_light.h | 7 +-- engine/src/gldrv/gl_matrix.h | 1 + engine/src/gldrv/gl_undefined_extensions.h | 1 + engine/src/gldrv/glx_undefined_extensions.h | 1 + engine/src/gldrv/hashtable_3d.h | 8 +-- engine/src/gldrv/sdds.h | 8 +-- engine/src/gldrv/winsys.h | 7 +-- engine/src/gnuhash.h | 6 +- engine/src/gui/button.h | 8 +-- engine/src/gui/control.h | 8 +-- engine/src/gui/eventmanager.h | 8 +-- engine/src/gui/eventresponder.h | 8 +-- engine/src/gui/font.h | 8 +-- engine/src/gui/glut_support.h | 8 +-- engine/src/gui/groupcontrol.h | 8 +-- engine/src/gui/guidefs.h | 8 +-- engine/src/gui/guitexture.h | 7 +-- engine/src/gui/modaldialog.h | 8 +-- engine/src/gui/newbutton.h | 8 +-- engine/src/gui/painttext.h | 8 +-- engine/src/gui/picker.h | 8 +-- engine/src/gui/scroller.h | 8 +-- engine/src/gui/simplepicker.h | 8 +-- engine/src/gui/slider.h | 8 +-- engine/src/gui/staticdisplay.h | 8 +-- engine/src/gui/text_area.h | 8 +-- engine/src/gui/textinputdisplay.h | 8 +-- engine/src/gui/window.h | 8 +-- engine/src/gui/windowcontroller.h | 8 +-- engine/src/hashtable.h | 10 ++-- engine/src/heap.h | 6 +- engine/src/in.h | 7 +-- engine/src/in_handler.h | 6 +- engine/src/in_joystick.h | 17 +++--- engine/src/in_kb.h | 16 +++--- engine/src/in_kb_data.h | 7 ++- engine/src/in_main.h | 7 +-- engine/src/in_mouse.h | 6 +- engine/src/lin_time.h | 7 +-- engine/src/linecollide.h | 7 +-- engine/src/load_mission.h | 2 +- engine/src/macosx_math.h | 9 +-- engine/src/main_loop.h | 8 +-- engine/src/mmorpgclient.h | 9 +-- engine/src/options.h | 8 +-- engine/src/physics.h | 7 +-- engine/src/precompiled.h | 18 +++--- engine/src/profile.h | 6 +- engine/src/python/define_odd_unit_functions.h | 1 + engine/src/python/init.h | 36 +++++++----- engine/src/python/python_class.h | 31 +++++----- engine/src/python/python_compile.h | 9 ++- engine/src/python/python_unit_wrap.h | 22 ++++--- engine/src/python/star_system_exports.h | 1 + engine/src/python/unit_exports.h | 7 ++- engine/src/python/unit_from_to_python.h | 12 ++-- engine/src/python/unit_wrapper_class.h | 2 +- engine/src/rendertext.h | 1 + engine/src/resizable.h | 1 + engine/src/resource/product.h | 7 +-- engine/src/resource/resource.h | 7 +-- engine/src/resource/store.h | 9 +-- engine/src/save_util.h | 7 +-- engine/src/savegame.h | 7 +-- engine/src/ship_commands.h | 8 +-- engine/src/star_system.h | 8 +-- engine/src/star_system_generic.h | 1 + engine/src/star_xml.h | 7 +-- engine/src/stardate.h | 7 +-- engine/src/system_factory.h | 7 +-- engine/src/universe.h | 6 +- engine/src/universe_globals.h | 7 +-- engine/src/universe_util.h | 6 +- engine/src/vega_cast_utils.h | 7 +-- engine/src/vega_py_run.h | 8 +-- engine/src/vega_string_utils.h | 11 ++-- engine/src/vegastrike.h | 23 ++++---- engine/src/vs_exit.h | 7 +-- engine/src/vs_globals.h | 7 +-- engine/src/vs_logging.h | 8 +-- engine/src/vs_math.h | 18 +++--- engine/src/vs_random.h | 1 + engine/src/vs_vector.h | 9 +-- engine/src/vsfilesystem.h | 7 +-- engine/src/xml_serializer.h | 8 ++- engine/src/xml_support.h | 13 +++-- engine/tools/common.h | 6 +- engine/tools/vsrtools.h | 6 +- engine/vs_cubemap_gen/src/color/color.h | 9 +-- engine/vs_cubemap_gen/src/command/command.h | 9 +-- engine/vs_cubemap_gen/src/errors/errors.h | 9 +-- engine/vs_cubemap_gen/src/file_io/file_io.h | 9 +-- engine/vs_cubemap_gen/src/filter/filter.h | 9 +-- .../src/filter/filter_impl/filter_math.h | 9 +-- .../src/filter/filter_impl/filter_one_texel.h | 9 +-- .../src/filter/filter_settings.h | 9 +-- engine/vs_cubemap_gen/src/first.h | 9 +-- engine/vs_cubemap_gen/src/fvector/fvector.h | 9 +-- engine/vs_cubemap_gen/src/process/process.h | 9 +-- engine/vs_cubemap_gen/src/settings/settings.h | 9 +-- .../vs_cubemap_gen/src/texture/mem_texture.h | 9 +-- .../src/texture/mem_texture_impl/coords.h | 9 +-- .../src/texture/mem_texture_impl/side.h | 9 +-- .../src/texture/texture_settings.h | 10 +--- engine/vs_cubemap_gen/src/units/units.h | 9 +-- 459 files changed, 1464 insertions(+), 2002 deletions(-) diff --git a/engine/launcher/general.h b/engine/launcher/general.h index 87819b84e0..6fb4ac998c 100644 --- a/engine/launcher/general.h +++ b/engine/launcher/general.h @@ -28,8 +28,8 @@ // Mar 05, 2002: Fixed the FindFiles() so it now checks sub directories // Mar 05, 2002: Fixed FindFiles() again -#ifndef GENERAL_H -#define GENERAL_H +#ifndef VEGA_STRIKE_LAUNCHER_GENERAL_H +#define VEGA_STRIKE_LAUNCHER_GENERAL_H /* Don't forget, these defines can be set at compile time with the compile flag -D */ @@ -177,4 +177,4 @@ glob_t *FindFiles(char *path, char *extension); glob_t *FindDirs(char *path); #endif // _G_PATH -#endif // GENERAL_H +#endif // VEGA_STRIKE_LAUNCHER_GENERAL_H diff --git a/engine/mission/include/central.h b/engine/mission/include/central.h index 8854360f5e..24f056b936 100644 --- a/engine/mission/include/central.h +++ b/engine/mission/include/central.h @@ -19,10 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -// Check to see if we're already loaded -#ifndef CENTRAL_H -#define CENTRAL_H +#ifndef VEGA_STRIKE_ENGINE_MISSION_CENTRAL_H +#define VEGA_STRIKE_ENGINE_MISSION_CENTRAL_H #define MISSION_VERSION "1.0.0.1" #define MISSION_PROGRAM "Vega Strike" @@ -67,4 +65,4 @@ struct mission_data { extern glob_t *MISSIONS; extern struct mission_data DATA; -#endif //CENTRAL_H +#endif //VEGA_STRIKE_ENGINE_MISSION_CENTRAL_H diff --git a/engine/mission/include/display_gtk.h b/engine/mission/include/display_gtk.h index 31e9a77a45..82419e6f1d 100644 --- a/engine/mission/include/display_gtk.h +++ b/engine/mission/include/display_gtk.h @@ -19,10 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -// Check to see if we're already loaded -#ifndef DISPLAY_GTK_H -#define DISPLAY_GTK_H +#ifndef VEGA_STRIKE_ENGINE_MISSION_DISPLAY_GTK_H +#define VEGA_STRIKE_ENGINE_MISSION_DISPLAY_GTK_H #include "central.h" @@ -41,4 +39,4 @@ void cb_unselect_child(GtkWidget *root_tree, GtkWidget *child, GtkWidget *subtre void cb_select_child(GtkWidget *root_tree, GtkWidget *child, GtkWidget *subtree); void cb_selection_changed(GtkWidget *tree); -#endif //DISPLAY_GTK_H +#endif //VEGA_STRIKE_ENGINE_MISSION_DISPLAY_GTK_H diff --git a/engine/mission/include/easydom.h b/engine/mission/include/easydom.h index e8f7447da1..2f0baa8af7 100644 --- a/engine/mission/include/easydom.h +++ b/engine/mission/include/easydom.h @@ -24,8 +24,8 @@ easyDom - easy DOM for expat - written by Alexander Rawass <alexannika@users.sourceforge.net> */ -#ifndef _EASYDOM_H_ -#define _EASYDOM_H_ +#ifndef VEGA_STRIKE_ENGINE_MISSION_EASYDOM_H +#define VEGA_STRIKE_ENGINE_MISSION_EASYDOM_H #include <expat.h> #include <string> @@ -260,4 +260,4 @@ class easyDomFactory { domNodeType *topnode; }; -#endif // _EASYDOM_H_ +#endif //VEGA_STRIKE_ENGINE_MISSION_EASYDOM_H diff --git a/engine/mission/include/file.h b/engine/mission/include/file.h index 9a766b9797..fbb708b3a6 100644 --- a/engine/mission/include/file.h +++ b/engine/mission/include/file.h @@ -19,10 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -// Check to see if we're already loaded -#ifndef FILE_H -#define FILE_H +#ifndef VEGA_STRIKE_ENGINE_MISSION_FILE_H +#define VEGA_STRIKE_ENGINE_MISSION_FILE_H #include "central.h" #include "easydom.h" @@ -77,4 +75,4 @@ class missionNode : public tagDomNode { struct script_t script; }; -#endif +#endif //VEGA_STRIKE_ENGINE_MISSION_FILE_H diff --git a/engine/mission/include/general.h b/engine/mission/include/general.h index 66e754185d..19b8d03e56 100644 --- a/engine/mission/include/general.h +++ b/engine/mission/include/general.h @@ -19,11 +19,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - // Version 2.2 - -#ifndef GENERAL_H -#define GENERAL_H +#ifndef VEGA_STRIKE_ENGINE_MISSION_GENERAL_H +#define VEGA_STRIKE_ENGINE_MISSION_GENERAL_H /* Don't forget, these defines can be set at compile time with the compile flag -D */ @@ -154,4 +152,4 @@ glob_t *FindFiles(char *path, char *extension); glob_t *FindDirs(char *path); #endif // _G_GLOB -#endif // GENERAL_H +#endif // VEGA_STRIKE_ENGINE_MISSION_GENERAL_H diff --git a/engine/mission/include/hashtable.h b/engine/mission/include/hashtable.h index d0421faa9c..8251263a2b 100644 --- a/engine/mission/include/hashtable.h +++ b/engine/mission/include/hashtable.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef _HASHTABLE_H_ -#define _HASHTABLE_H_ +#ifndef VEGA_STRIKE_ENGINE_MISION_HASHTABLE_H +#define VEGA_STRIKE_ENGINE_MISION_HASHTABLE_H #include <math.h> #include <list> @@ -111,5 +110,4 @@ class Hashtable { */ }; -#endif - +#endif //VEGA_STRIKE_ENGINE_MISION_HASHTABLE_H diff --git a/engine/mission/include/xml_support.h b/engine/mission/include/xml_support.h index 3b2a36a8a5..6a95311579 100644 --- a/engine/mission/include/xml_support.h +++ b/engine/mission/include/xml_support.h @@ -19,10 +19,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_MISSION_XML_SUPPORT_H +#define VEGA_STRIKE_ENGINE_MISSION_XML_SUPPORT_H -#ifndef _XML_SUPPORT_H_ - -#define _XML_SUPPORT_H_ #include <stdio.h> #include <string> #ifndef WIN32 @@ -106,4 +105,5 @@ string inline tostring(float num) { } #endif*/ } -#endif + +#endif //VEGA_STRIKE_ENGINE_MISSION_XML_SUPPORT_H diff --git a/engine/objconv/basemaker/base_maker_texture.h b/engine/objconv/basemaker/base_maker_texture.h index 9aeb0392f6..710c49bacb 100644 --- a/engine/objconv/basemaker/base_maker_texture.h +++ b/engine/objconv/basemaker/base_maker_texture.h @@ -19,6 +19,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +// NO HEADER GUARD ///A single OpenGL texture #include "gldrv/gl_globals.h" diff --git a/engine/objconv/basemaker/sprite.h b/engine/objconv/basemaker/sprite.h index dfee09eea3..4ceb82288c 100644 --- a/engine/objconv/basemaker/sprite.h +++ b/engine/objconv/basemaker/sprite.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef SPRITE_H -#define SPRITE_H +#ifndef VEGA_STRIKE_ENGINE_OBJCONV_SPRITE_H +#define VEGA_STRIKE_ENGINE_OBJCONV_SPRITE_H #include "gfx/quaternion.h" #include "gfx/vec.h" @@ -80,4 +79,4 @@ class VSSprite { } }; -#endif +#endif //VEGA_STRIKE_ENGINE_OBJCONV_SPRITE_H diff --git a/engine/objconv/mesher/Converter.h b/engine/objconv/mesher/Converter.h index e2b728de8d..f3553e85b3 100644 --- a/engine/objconv/mesher/Converter.h +++ b/engine/objconv/mesher/Converter.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __CONVERTER_API__INCLUDED__ -#define __CONVERTER_API__INCLUDED__ +#ifndef VEGA_STRIKE_ENGINE_OBJCONV_CONVERTER_H +#define VEGA_STRIKE_ENGINE_OBJCONV_CONVERTER_H namespace Converter { typedef std::vector<std::string> ParameterList; @@ -209,5 +208,4 @@ class ConversionImplDeclaration { }; } -#endif //__CONVERTER_API__INCLUDED__ - +#endif //VEGA_STRIKE_ENGINE_OBJCONV_CONVERTER_H diff --git a/engine/objconv/mesher/PrecompiledHeaders/Converter.h b/engine/objconv/mesher/PrecompiledHeaders/Converter.h index b8395af5e2..64514e8637 100644 --- a/engine/objconv/mesher/PrecompiledHeaders/Converter.h +++ b/engine/objconv/mesher/PrecompiledHeaders/Converter.h @@ -22,6 +22,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +// NO HEADER GUARD #ifdef HAVE_OGRE #include <OgrePrerequisites.h> diff --git a/engine/objconv/mesher/PrecompiledHeaders/Standard.h b/engine/objconv/mesher/PrecompiledHeaders/Standard.h index 0435eef559..23d80e7a07 100644 --- a/engine/objconv/mesher/PrecompiledHeaders/Standard.h +++ b/engine/objconv/mesher/PrecompiledHeaders/Standard.h @@ -22,9 +22,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __PRECOMPILED_STANDARD_INCLUDED__ -#define __PRECOMPILED_STANDARD_INCLUDED__ +#ifndef VEGA_STRIKE_ENGINE_OBJCONV_PRECOMPILED_STANDARD_H +#define VEGA_STRIKE_ENGINE_OBJCONV_PRECOMPILED_STANDARD_H #include <string> #include <vector> @@ -35,5 +34,4 @@ #include <iostream> #include <iomanip> -#endif//__PRECOMPILED_STANDARD_INCLUDED__ - +#endif //VEGA_STRIKE_ENGINE_OBJCONV_PRECOMPILED_STANDARD_H diff --git a/engine/objconv/mesher/expat.h b/engine/objconv/mesher/expat.h index 55a58ea31e..41a195b0e0 100644 --- a/engine/objconv/mesher/expat.h +++ b/engine/objconv/mesher/expat.h @@ -2,6 +2,7 @@ * Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd * See the file COPYING for copying permission. */ +// NO HEADER GUARD -- 3rd Party #ifndef XmlParse_INCLUDED #define XmlParse_INCLUDED 1 diff --git a/engine/objconv/mesher/from_BFXM.h b/engine/objconv/mesher/from_BFXM.h index 120be0cd73..1ad7f0db9a 100644 --- a/engine/objconv/mesher/from_BFXM.h +++ b/engine/objconv/mesher/from_BFXM.h @@ -19,6 +19,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +// NO HEADER GUARD #include <string> #include <vector> diff --git a/engine/objconv/mesher/from_obj.h b/engine/objconv/mesher/from_obj.h index 84ac6bb45e..cce7c4621c 100644 --- a/engine/objconv/mesher/from_obj.h +++ b/engine/objconv/mesher/from_obj.h @@ -19,6 +19,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +// NO HEADER GUARD #include "mesh_io.h" #include "to_BFXM.h" diff --git a/engine/objconv/mesher/mesh.h b/engine/objconv/mesher/mesh.h index 67ddaf352b..49295ea064 100644 --- a/engine/objconv/mesher/mesh.h +++ b/engine/objconv/mesher/mesh.h @@ -22,9 +22,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_OBJCONV_MESH_H +#define VEGA_STRIKE_ENGINE_OBJCONV_MESH_H -#ifndef _MESH_H_ -#define _MESH_H_ - -#endif - +#endif //VEGA_STRIKE_ENGINE_OBJCONV_MESH_H diff --git a/engine/objconv/mesher/mesh_io.h b/engine/objconv/mesher/mesh_io.h index 1dffae5de1..a935ab81aa 100644 --- a/engine/objconv/mesher/mesh_io.h +++ b/engine/objconv/mesher/mesh_io.h @@ -22,6 +22,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +// NO HEADER GUARD #define DEFINE_BLENDFUNC #include "gfx/mesh_io.h" diff --git a/engine/objconv/mesher/to_BFXM.h b/engine/objconv/mesher/to_BFXM.h index 69b7ed0701..33bdf9f618 100644 --- a/engine/objconv/mesher/to_BFXM.h +++ b/engine/objconv/mesher/to_BFXM.h @@ -19,9 +19,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_OBJCONV_TO_BFXM_H +#define VEGA_STRIKE_ENGINE_OBJCONV_TO_BFXM_H -#ifndef _TO_BFXM_H_ -#define _TO_BFXM_H_ #include <string> #include <vector> ///Stores all the load-time vertex info in the XML struct FIXME light calculations @@ -466,5 +466,4 @@ unsigned int appendmeshfromxml(XML memfile, void AddNormal(GFXVertex &outp, const GFXVertex &inp); void SetNormal(GFXVertex &outp, const GFXVertex &a, const GFXVertex &b, const GFXVertex &c); -#endif - +#endif //VEGA_STRIKE_ENGINE_OBJCONV_TO_BFXM_H diff --git a/engine/objconv/mesher/to_OgreMesh.h b/engine/objconv/mesher/to_OgreMesh.h index 8d66c78ca8..c3b4723e29 100644 --- a/engine/objconv/mesher/to_OgreMesh.h +++ b/engine/objconv/mesher/to_OgreMesh.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef _TO_OGREMESH_H_ -#define _TO_OGREMESH_H_ +#ifndef VEGA_STRIKE_ENGINE_OBJCONV_TO_OGREMESH_H +#define VEGA_STRIKE_ENGINE_OBJCONV_TO_OGREMESH_H #include "to_BFXM.h" @@ -55,5 +54,4 @@ void AutoEdgeList(void *outputcontext); //a good idea - prepares the mesh fo void AutoTangents(void *outputcontext); //prepares the mesh for normal mapping (only needed if the material uses normal mapping) } -#endif - +#endif //VEGA_STRIKE_ENGINE_OBJCONV_TO_OGREMESH_H diff --git a/engine/objconv/mesher/to_obj.h b/engine/objconv/mesher/to_obj.h index 96ea3a4e1a..597252d4a4 100644 --- a/engine/objconv/mesher/to_obj.h +++ b/engine/objconv/mesher/to_obj.h @@ -22,5 +22,4 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - +// NO HEADER GUARD diff --git a/engine/objconv/trisort.h b/engine/objconv/trisort.h index 94bcaaddc1..2eb8f040f1 100644 --- a/engine/objconv/trisort.h +++ b/engine/objconv/trisort.h @@ -19,6 +19,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +// NO HEADER GUARD enum POLYGON_RELATION { BACK = -1, diff --git a/engine/setup/src/include/central.h b/engine/setup/src/include/central.h index f5e6b193c8..04f366a28b 100644 --- a/engine/setup/src/include/central.h +++ b/engine/setup/src/include/central.h @@ -19,10 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -// Check to see if we're already loaded -#ifndef CENTRAL_H -#define CENTRAL_H +#ifndef VEGA_STRIKE_ENGINE_SETUP_CENTRAL_H +#define VEGA_STRIKE_ENGINE_SETUP_CENTRAL_H // Which interface to use. Only have one of these uncommented // If you're using 'build' to compile, you will need to move any files not being linked to dont_link @@ -86,4 +84,4 @@ extern struct catagory CATS; extern struct group GROUPS; extern struct global_settings CONFIG; -#endif //CENTRAL_H +#endif //VEGA_STRIKE_ENGINE_SETUP_CENTRAL_H diff --git a/engine/setup/src/include/display.h b/engine/setup/src/include/display.h index 2e4e55c504..580d9adc9d 100644 --- a/engine/setup/src/include/display.h +++ b/engine/setup/src/include/display.h @@ -28,8 +28,8 @@ */ // Check to see if we're already loaded -#ifndef DISPLAY_H -#define DISPLAY_H +#ifndef VEGA_STRIKE_ENGINE_SETUP_DISPLAY_H +#define VEGA_STRIKE_ENGINE_SETUP_DISPLAY_H #include "central.h" #include "version.h" @@ -48,4 +48,4 @@ the latest drivers for your video card.\nIf you run into problems please \ upgrade your video drivers.\n\nTo adjust volume levels in-game, use F9/F10 \ for sound and F11/F12 for music." -#endif //DISPLAY_H +#endif //VEGA_STRIKE_ENGINE_SETUP_DISPLAY_H diff --git a/engine/setup/src/include/dont_link/display_console.h b/engine/setup/src/include/dont_link/display_console.h index 7209dd46b7..eb00da7d50 100644 --- a/engine/setup/src/include/dont_link/display_console.h +++ b/engine/setup/src/include/dont_link/display_console.h @@ -16,8 +16,8 @@ **************************************************************************/ // Check to see if we're already loaded -#ifndef DISPLAY_CONSOLE_H -#define DISPLAY_CONSOLE_H +#ifndef VEGA_STRIKE_ENGINE_SETUP_DONT_LINK_DISPLAY_CONSOLE_H +#define VEGA_STRIKE_ENGINE_SETUP_DONT_LINK_DISPLAY_CONSOLE_H #include "central.h" @@ -25,4 +25,4 @@ void InitGraphics(); void ShowMain(); void ShowChoices(int val); -#endif //DISPLAY_CONSOLE_H +#endif //VEGA_STRIKE_ENGINE_SETUP_DONT_LINK_DISPLAY_CONSOLE_H diff --git a/engine/setup/src/include/file.h b/engine/setup/src/include/file.h index 51e7dba8e4..5f9313634d 100644 --- a/engine/setup/src/include/file.h +++ b/engine/setup/src/include/file.h @@ -16,8 +16,8 @@ **************************************************************************/ // Check to see if we're already loaded -#ifndef FILE_H -#define FILE_H +#ifndef VEGA_STRIKE_ENGINE_SETUP_FILE_H +#define VEGA_STRIKE_ENGINE_SETUP_FILE_H #include "central.h" @@ -27,4 +27,4 @@ void Modconfig(int setting, const char *name, const char *group); void EnableSetting(const char *name, const char *group); void DisableSetting(const char *name, const char *group); -#endif +#endif //VEGA_STRIKE_ENGINE_SETUP_FILE_H diff --git a/engine/setup/src/include/general.h b/engine/setup/src/include/general.h index 08f43b08d2..b56aea4d30 100644 --- a/engine/setup/src/include/general.h +++ b/engine/setup/src/include/general.h @@ -22,8 +22,8 @@ // Version 2.1 -#ifndef GENERAL_H -#define GENERAL_H +#ifndef VEGA_STRIKE_ENGINE_SETUP_GENERAL_H +#define VEGA_STRIKE_ENGINE_SETUP_GENERAL_H //#define GLIB @@ -83,10 +83,11 @@ char *GetString(GString *line); void SetString(GString **ptr, char *line); #endif //GLIB char *NewString(const char *string); -#endif //GENERAL_H char *xml_pre_chomp_comment(char *string); char *xml_chomp_comment(char *string); #ifdef __cplusplus //iostream is only used in debugging } -#endif +#endif //__cplusplus + +#endif //VEGA_STRIKE_ENGINE_SETUP_GENERAL_H diff --git a/engine/src/SharedPool.h b/engine/src/SharedPool.h index 9a64e194d1..f506a2c28a 100644 --- a/engine/src/SharedPool.h +++ b/engine/src/SharedPool.h @@ -19,9 +19,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_STRINGPOOL_H +#define VEGA_STRIKE_ENGINE_STRINGPOOL_H -#ifndef __STRINGPOOL_H__INCLUDED__ -#define __STRINGPOOL_H__INCLUDED__ #include <string> #include "gnuhash.h" @@ -209,5 +209,4 @@ inline T &operator<<(T &stream, const StringPool::Reference &ref) { #include "SharedPool.cpp" -#endif //__STRINGPOOL_H__INCLUDED__ - +#endif //VEGA_STRIKE_ENGINE_STRINGPOOL_H diff --git a/engine/src/Singleton.h b/engine/src/Singleton.h index 09f0d7297e..c0ac7a48cc 100644 --- a/engine/src/Singleton.h +++ b/engine/src/Singleton.h @@ -19,12 +19,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_SINGLETON_H +#define VEGA_STRIKE_ENGINE_SINGLETON_H // //C++ Template: Singleton<T> // -#ifndef __SINGLETON_H__INCLUDED__ -#define __SINGLETON_H__INCLUDED__ namespace InitializationFunctors { template<typename T> @@ -81,5 +81,4 @@ class Singleton { } }; -#endif //__SINGLETON_H__INCLUDED__ - +#endif //VEGA_STRIKE_ENGINE_SINGLETON_H diff --git a/engine/src/XMLDocument.h b/engine/src/XMLDocument.h index 68dd3eb63c..2204238ccc 100644 --- a/engine/src/XMLDocument.h +++ b/engine/src/XMLDocument.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __XMLDOCUMENT_H__INCLUDED__ -#define __XMLDOCUMENT_H__INCLUDED__ +#ifndef VEGA_STRIKE_ENGINE_XMLDOCUMENT_H +#define VEGA_STRIKE_ENGINE_XMLDOCUMENT_H #include <string> #include <map> @@ -546,5 +545,5 @@ class XMLProcessor { }; } -#endif //__XMLDOCUMENT_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_XMLDOCUMENT_H diff --git a/engine/src/abstract_config.h b/engine/src/abstract_config.h index 000e574073..1322546dff 100644 --- a/engine/src/abstract_config.h +++ b/engine/src/abstract_config.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef ABSTRACTCONFIG_H -#define ABSTRACTCONFIG_H +#ifndef VEGA_STRIKE_ENGINE_ABSTRACT_CONFIG_H +#define VEGA_STRIKE_ENGINE_ABSTRACT_CONFIG_H #include <string> @@ -37,4 +36,4 @@ class AbstractConfig { AbstractConfig(); }; -#endif // ABSTRACTCONFIG_H +#endif //VEGA_STRIKE_ENGINE_ABSTRACT_CONFIG_H diff --git a/engine/src/aldrv/al_globals.h b/engine/src/aldrv/al_globals.h index f269e0a41e..ad2803f0a7 100644 --- a/engine/src/aldrv/al_globals.h +++ b/engine/src/aldrv/al_globals.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef AL_GLOBALS_H_ -#define AL_GLOBALS_H_ +#ifndef VEGA_STRIKE_ENGINE_AL_GLOBALS_H +#define VEGA_STRIKE_ENGINE_AL_GLOBALS_H /* #undef SOUND_DEBUG */ @@ -121,5 +119,4 @@ bool AUDLoadSoundFile(const char *s, struct AUDSoundProperties *info, bool use_f //It is up to the caller to free(info.wave) after using!!! int AUDBufferSound(const struct AUDSoundProperties *info, bool music); -#endif - +#endif //VEGA_STRIKE_ENGINE_AL_GLOBALS_H diff --git a/engine/src/atmospheric_fog_mesh.h b/engine/src/atmospheric_fog_mesh.h index 0126cacf97..c89f02f395 100644 --- a/engine/src/atmospheric_fog_mesh.h +++ b/engine/src/atmospheric_fog_mesh.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef ATMOSPHERICFOGMESH_H -#define ATMOSPHERICFOGMESH_H +#ifndef VEGA_STRIKE_ENGINE_ATMOSPHERIC_FOG_MESH_H +#define VEGA_STRIKE_ENGINE_ATMOSPHERIC_FOG_MESH_H #include <string> @@ -45,4 +44,4 @@ struct AtmosphericFogMesh { AtmosphericFogMesh(); }; -#endif // ATMOSPHERICFOGMESH_H +#endif //VEGA_STRIKE_ENGINE_ATMOSPHERIC_FOG_MESH_H diff --git a/engine/src/audio/CodecRegistry.h b/engine/src/audio/CodecRegistry.h index 0a4162879c..160ede72a1 100644 --- a/engine/src/audio/CodecRegistry.h +++ b/engine/src/audio/CodecRegistry.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_CODECREGISTRY_H +#define VEGA_STRIKE_ENGINE_AUDIO_CODECREGISTRY_H // // C++ Interface: Audio::CodecRegistry // -#ifndef __AUDIO_CODECREGISTRY_H__INCLUDED__ -#define __AUDIO_CODECREGISTRY_H__INCLUDED__ #include <string> #include <map> @@ -128,4 +127,4 @@ class CodecRegistration { }; -#endif//__AUDIO_CODECREGISTRY_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_CODECREGISTRY_H diff --git a/engine/src/audio/Exceptions.h b/engine/src/audio/Exceptions.h index 9780c20afb..c4a6cf2f7c 100644 --- a/engine/src/audio/Exceptions.h +++ b/engine/src/audio/Exceptions.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_EXCEPTIONS_H +#define VEGA_STRIKE_ENGINE_AUDIO_EXCEPTIONS_H // // C++ Interface: Audio::Codec // -#ifndef __AUDIO_EXCEPTIONS_H__INCLUDED__ -#define __AUDIO_EXCEPTIONS_H__INCLUDED__ #include <string> #include <exception> @@ -262,4 +261,4 @@ class OutOfMemoryException : public Exception { }; -#endif//__AUDIO_EXCEPTIONS_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_EXCEPTIONS_H diff --git a/engine/src/audio/Format.h b/engine/src/audio/Format.h index 3c6e0d97f8..26ddabbad7 100644 --- a/engine/src/audio/Format.h +++ b/engine/src/audio/Format.h @@ -23,13 +23,11 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_FORMAT_H +#define VEGA_STRIKE_ENGINE_AUDIO_FORMAT_H // // C++ Interface: Audio::Codec // -#ifndef __AUDIO_FORMAT_H__INCLUDED__ -#define __AUDIO_FORMAT_H__INCLUDED__ namespace Audio { @@ -78,4 +76,4 @@ struct Format { }; -#endif//__AUDIO_FORMAT_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_FORMAT_H diff --git a/engine/src/audio/Listener.h b/engine/src/audio/Listener.h index c159d1fabf..6ec4592236 100644 --- a/engine/src/audio/Listener.h +++ b/engine/src/audio/Listener.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_LISTENER_H +#define VEGA_STRIKE_ENGINE_AUDIO_LISTENER_H // // C++ Interface: Audio::Scene // -#ifndef __AUDIO_LISTENER_H__INCLUDED__ -#define __AUDIO_LISTENER_H__INCLUDED__ #include "Exceptions.h" #include "Types.h" @@ -227,4 +226,4 @@ class Listener { }; -#endif//__AUDIO_LISTENER_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_LISTENER_H diff --git a/engine/src/audio/Matrix.h b/engine/src/audio/Matrix.h index 19b201383d..5d3a9fcd95 100644 --- a/engine/src/audio/Matrix.h +++ b/engine/src/audio/Matrix.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_MATRIX_H +#define VEGA_STRIKE_ENGINE_AUDIO_MATRIX_H // // C++ Interface: Audio::Codec // -#ifndef __AUDIO_MATRIX_H__INCLUDED__ -#define __AUDIO_MATRIX_H__INCLUDED__ #include <math.h> #include "Vector.h" @@ -269,4 +268,4 @@ class TMatrix3 { }; -#endif//__AUDIO_VECTOR_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_MATRIX_H diff --git a/engine/src/audio/RenderableListener.h b/engine/src/audio/RenderableListener.h index fbe5b99499..1644e02aa2 100644 --- a/engine/src/audio/RenderableListener.h +++ b/engine/src/audio/RenderableListener.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_RENDERABLELISTENER_H +#define VEGA_STRIKE_ENGINE_AUDIO_RENDERABLELISTENER_H // // C++ Interface: Audio::RenderableListener // -#ifndef __AUDIO_RENDERABLELISTENER_H__INCLUDED__ -#define __AUDIO_RENDERABLELISTENER_H__INCLUDED__ #include "Exceptions.h" #include "Types.h" @@ -98,4 +97,4 @@ class RenderableListener : public UserData { }; -#endif//__AUDIO_RENDERABLELISTENER_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_RENDERABLELISTENER_H diff --git a/engine/src/audio/RenderableSource.h b/engine/src/audio/RenderableSource.h index 4c0673115c..ec60866018 100644 --- a/engine/src/audio/RenderableSource.h +++ b/engine/src/audio/RenderableSource.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_RENDERABLESOURCE_H +#define VEGA_STRIKE_ENGINE_AUDIO_RENDERABLESOURCE_H // // C++ Interface: Audio::RenderableSource // -#ifndef __AUDIO_RENDERABLESOURCE_H__INCLUDED__ -#define __AUDIO_RENDERABLESOURCE_H__INCLUDED__ #include "Exceptions.h" #include "Types.h" @@ -152,4 +151,4 @@ class RenderableSource : public UserData { }; -#endif//__AUDIO_RENDERABLESOURCE_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_RENDERABLESOURCE_H diff --git a/engine/src/audio/Renderer.h b/engine/src/audio/Renderer.h index d489e59c60..220ea9a0fc 100644 --- a/engine/src/audio/Renderer.h +++ b/engine/src/audio/Renderer.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_RENDERER_H +#define VEGA_STRIKE_ENGINE_AUDIO_RENDERER_H // // C++ Interface: Audio::SceneManager // -#ifndef __AUDIO_RENDERER_H__INCLUDED__ -#define __AUDIO_RENDERER_H__INCLUDED__ #include <string> #include <map> @@ -174,4 +173,4 @@ class Renderer { }; -#endif//__AUDIO_RENDERER_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_RENDERER_H diff --git a/engine/src/audio/Scene.h b/engine/src/audio/Scene.h index 4f3bc74c0e..6a0afa0943 100644 --- a/engine/src/audio/Scene.h +++ b/engine/src/audio/Scene.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_SCENE_H +#define VEGA_STRIKE_ENGINE_AUDIO_SCENE_H // // C++ Interface: Audio::Scene // -#ifndef __AUDIO_SCENE_H__INCLUDED__ -#define __AUDIO_SCENE_H__INCLUDED__ #include "Exceptions.h" #include "Types.h" @@ -83,4 +82,4 @@ class Scene { }; -#endif//__AUDIO_SCENE_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_SCENE_H diff --git a/engine/src/audio/SceneManager.h b/engine/src/audio/SceneManager.h index 3bcc189d78..201ecfd3dd 100644 --- a/engine/src/audio/SceneManager.h +++ b/engine/src/audio/SceneManager.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_SCENEMANAGER_H +#define VEGA_STRIKE_ENGINE_AUDIO_SCENEMANAGER_H // // C++ Interface: Audio::SceneManager // -#ifndef __AUDIO_SCENEMANAGER_H__INCLUDED__ -#define __AUDIO_SCENEMANAGER_H__INCLUDED__ #include <string> #include <map> @@ -358,4 +357,4 @@ class SceneManager : public Singleton<SceneManager> { }; -#endif//__AUDIO_SCENEMANAGER_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_SCENEMANAGER_H diff --git a/engine/src/audio/SimpleScene.h b/engine/src/audio/SimpleScene.h index 1919ba27e8..94fe720518 100644 --- a/engine/src/audio/SimpleScene.h +++ b/engine/src/audio/SimpleScene.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_SIMPLESCENE_H +#define VEGA_STRIKE_ENGINE_AUDIO_SIMPLESCENE_H // // C++ Interface: Audio::SimpleScene // -#ifndef __AUDIO_SIMPLESCENE_H__INCLUDED__ -#define __AUDIO_SIMPLESCENE_H__INCLUDED__ #include "Exceptions.h" #include "Types.h" @@ -105,4 +104,4 @@ class SimpleScene : public Scene, public SharedFromThis<SimpleScene> { }; -#endif//__AUDIO_SIMPLESCENE_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_SIMPLESCENE_H diff --git a/engine/src/audio/SimpleSound.h b/engine/src/audio/SimpleSound.h index 348b75de80..cc294f54d8 100644 --- a/engine/src/audio/SimpleSound.h +++ b/engine/src/audio/SimpleSound.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_SIMPLESOUND_H +#define VEGA_STRIKE_ENGINE_AUDIO_SIMPLESOUND_H // // C++ Interface: Audio::SimpleSound // -#ifndef __AUDIO_SIMPLESOUND_H__INCLUDED__ -#define __AUDIO_SIMPLESOUND_H__INCLUDED__ #include "Exceptions.h" #include "Types.h" @@ -122,4 +121,4 @@ class SimpleSound : public Sound { }; -#endif//__AUDIO_SIMPLESOUND_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_SIMPLESOUND_H diff --git a/engine/src/audio/SimpleSource.h b/engine/src/audio/SimpleSource.h index 2d4e611224..f428f3265c 100644 --- a/engine/src/audio/SimpleSource.h +++ b/engine/src/audio/SimpleSource.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_SIMPLESOURCE_H +#define VEGA_STRIKE_ENGINE_AUDIO_SIMPLESOURCE_H // // C++ Interface: Audio::SimpleSource // -#ifndef __AUDIO_SIMPLESOURCE_H__INCLUDED__ -#define __AUDIO_SIMPLESOURCE_H__INCLUDED__ #include "Exceptions.h" #include "Types.h" @@ -84,4 +83,4 @@ class SimpleSource : public Source, public SharedFromThis<SimpleSource> { }; -#endif//__AUDIO_SIMPLESOURCE_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_SIMPLESOURCE_H diff --git a/engine/src/audio/Sound.h b/engine/src/audio/Sound.h index 478dd0c963..d0bbd84ddf 100644 --- a/engine/src/audio/Sound.h +++ b/engine/src/audio/Sound.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_SOUND_H +#define VEGA_STRIKE_ENGINE_AUDIO_SOUND_H // // C++ Interface: Audio::Sound // -#ifndef __AUDIO_SOUND_H__INCLUDED__ -#define __AUDIO_SOUND_H__INCLUDED__ #include "Exceptions.h" #include "Types.h" @@ -166,4 +165,4 @@ class Sound { }; -#endif//__AUDIO_SOUND_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_SOUND_H diff --git a/engine/src/audio/SoundBuffer.h b/engine/src/audio/SoundBuffer.h index 606e5125bf..6281317c00 100644 --- a/engine/src/audio/SoundBuffer.h +++ b/engine/src/audio/SoundBuffer.h @@ -23,15 +23,13 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_SOUND_BUFFER_H +#define VEGA_STRIKE_ENGINE_AUDIO_SOUND_BUFFER_H // // C++ Interface: Audio::SoundBuffer // -#ifndef __AUDIO__SOUND_BUFFER__INCLUDED__ -#define __AUDIO__SOUND_BUFFER__INCLUDED__ - #include "Exceptions.h" #include "Format.h" @@ -156,4 +154,4 @@ class SoundBuffer { }; -#endif//__AUDIO__SOUND_BUFFER__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_SOUND_BUFFER_H diff --git a/engine/src/audio/Source.h b/engine/src/audio/Source.h index fa4de37f33..df0b1d908f 100644 --- a/engine/src/audio/Source.h +++ b/engine/src/audio/Source.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_SOURCE_H +#define VEGA_STRIKE_ENGINE_AUDIO_SOURCE_H // // C++ Interface: Audio::Source // -#ifndef __AUDIO_SOURCE_H__INCLUDED__ -#define __AUDIO_SOURCE_H__INCLUDED__ #include "Exceptions.h" #include "Types.h" @@ -425,4 +424,4 @@ class Source { }; -#endif//__AUDIO_SOURCE_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_SOURCE_H diff --git a/engine/src/audio/SourceListener.h b/engine/src/audio/SourceListener.h index c6b19ccbc3..711fd34073 100644 --- a/engine/src/audio/SourceListener.h +++ b/engine/src/audio/SourceListener.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_SOURCELISTENER_H +#define VEGA_STRIKE_ENGINE_AUDIO_SOURCELISTENER_H // // C++ Interface: Audio::SourceListener // -#ifndef __AUDIO_SOURCELISTENER_H__INCLUDED__ -#define __AUDIO_SOURCELISTENER_H__INCLUDED__ #include "Exceptions.h" #include "Types.h" @@ -193,4 +192,4 @@ class UpdateSourceListener : public SourceListener { }; -#endif//__AUDIO_SOURCELISTENER_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_SOURCELISTENER_H diff --git a/engine/src/audio/SourceTemplate.h b/engine/src/audio/SourceTemplate.h index 0b14f1b2fc..1812602084 100644 --- a/engine/src/audio/SourceTemplate.h +++ b/engine/src/audio/SourceTemplate.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_SOURCETEMPLATE_H +#define VEGA_STRIKE_ENGINE_AUDIO_SOURCETEMPLATE_H // // C++ Interface: Audio::SourceTemplate // -#ifndef __AUDIO_SOURCETEMPLATE_H__INCLUDED__ -#define __AUDIO_SOURCETEMPLATE_H__INCLUDED__ #include <string> #include "Exceptions.h" @@ -209,4 +208,4 @@ class SourceTemplate { }; -#endif//__AUDIO_SOURCETEMPLATE_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_SOURCETEMPLATE_H diff --git a/engine/src/audio/Stream.h b/engine/src/audio/Stream.h index 273a695db3..f64959af61 100644 --- a/engine/src/audio/Stream.h +++ b/engine/src/audio/Stream.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_STREAM_H +#define VEGA_STRIKE_ENGINE_AUDIO_STREAM_H // // C++ Interface: Audio::Codec // -#ifndef __AUDIO_STREAM_H__INCLUDED__ -#define __AUDIO_STREAM_H__INCLUDED__ #include <string> #include "Exceptions.h" @@ -163,4 +162,4 @@ class Stream { }; -#endif//__AUDIO_STREAM_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_STREAM_H diff --git a/engine/src/audio/Types.h b/engine/src/audio/Types.h index 9f6236c511..faf6c5f259 100644 --- a/engine/src/audio/Types.h +++ b/engine/src/audio/Types.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_TYPES_H +#define VEGA_STRIKE_ENGINE_AUDIO_TYPES_H // // C++ Interface: Audio::Codec // -#ifndef __AUDIO_TYPES_H__INCLUDED__ -#define __AUDIO_TYPES_H__INCLUDED__ #include <boost/smart_ptr.hpp> #include <boost/enable_shared_from_this.hpp> @@ -122,4 +121,4 @@ class UserData { }; -#endif//__AUDIO_TYPES_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_TYPES_H diff --git a/engine/src/audio/Vector.h b/engine/src/audio/Vector.h index e5dc0bf8c0..f746040eee 100644 --- a/engine/src/audio/Vector.h +++ b/engine/src/audio/Vector.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_VECTOR_H +#define VEGA_STRIKE_ENGINE_AUDIO_VECTOR_H // // C++ Interface: Audio::Codec // -#ifndef __AUDIO_VECTOR_H__INCLUDED__ -#define __AUDIO_VECTOR_H__INCLUDED__ #include <math.h> @@ -178,4 +177,4 @@ class TVector3 { }; -#endif//__AUDIO_VECTOR_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_VECTOR_H diff --git a/engine/src/audio/VirtualIterator.h b/engine/src/audio/VirtualIterator.h index 7a27153e58..122c23dd75 100644 --- a/engine/src/audio/VirtualIterator.h +++ b/engine/src/audio/VirtualIterator.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __AUDIO_VIRTUALITERATOR_H__INCLUDED__ -#define __AUDIO_VIRTUALITERATOR_H__INCLUDED__ +#ifndef VEGA_STRIKE_ENGINE_AUDIO_VIRTUALITERATOR_H +#define VEGA_STRIKE_ENGINE_AUDIO_VIRTUALITERATOR_H #include "Types.h" #include <iterator> @@ -331,4 +329,4 @@ class ChainingIterator : } -#endif//__AUDIO_VIRTUALITERATOR_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_VIRTUALITERATOR_H diff --git a/engine/src/audio/codecs/Codec.h b/engine/src/audio/codecs/Codec.h index 9f0f3c26ff..a0cced3c36 100644 --- a/engine/src/audio/codecs/Codec.h +++ b/engine/src/audio/codecs/Codec.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_CODEC_H +#define VEGA_STRIKE_ENGINE_AUDIO_CODEC_H // // C++ Interface: Audio::Codec // -#ifndef __AUDIO_CODEC_H__INCLUDED__ -#define __AUDIO_CODEC_H__INCLUDED__ #include <string> #include <vector> @@ -125,4 +124,4 @@ class Codec { }; -#endif//__AUDIO_CODEC_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_CODEC_H diff --git a/engine/src/audio/codecs/FFCodec.h b/engine/src/audio/codecs/FFCodec.h index fe133e59cb..a50e4a4f94 100644 --- a/engine/src/audio/codecs/FFCodec.h +++ b/engine/src/audio/codecs/FFCodec.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_FFCODEC_H +#define VEGA_STRIKE_ENGINE_AUDIO_FFCODEC_H // // C++ Interface: Audio::OggCodec // -#ifndef __AUDIO_FFCODEC_H__INCLUDED__ -#define __AUDIO_FFCODEC_H__INCLUDED__ #include "Codec.h" @@ -56,4 +55,4 @@ class FFCodec : public Codec { }; -#endif//__AUDIO_FFCODEC_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_FFCODEC_H diff --git a/engine/src/audio/codecs/FFStream.h b/engine/src/audio/codecs/FFStream.h index 66279c25f6..2f173c8bf4 100644 --- a/engine/src/audio/codecs/FFStream.h +++ b/engine/src/audio/codecs/FFStream.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_FF_STREAM_H +#define VEGA_STRIKE_ENGINE_AUDIO_FF_STREAM_H // // C++ Interface: Audio::Codec // -#ifndef __AUDIO_FF_STREAM_H__INCLUDED__ -#define __AUDIO_FF_STREAM_H__INCLUDED__ #ifdef HAVE_FFMPEG @@ -89,6 +88,6 @@ namespace Audio { }; -#endif//HAVE_FFMPEG +#endif //HAVE_FFMPEG -#endif//__AUDIO_FF_STREAM_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_FF_STREAM_H diff --git a/engine/src/audio/codecs/OggCodec.h b/engine/src/audio/codecs/OggCodec.h index 500de58dd7..8c2b76a02e 100644 --- a/engine/src/audio/codecs/OggCodec.h +++ b/engine/src/audio/codecs/OggCodec.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_OGGCODEC_H +#define VEGA_STRIKE_ENGINE_AUDIO_OGGCODEC_H // // C++ Interface: Audio::OggCodec // -#ifndef __AUDIO_OGGCODEC_H__INCLUDED__ -#define __AUDIO_OGGCODEC_H__INCLUDED__ #include "Codec.h" @@ -59,4 +58,4 @@ class OggCodec : public Codec { }; -#endif//__AUDIO_OGGCODEC_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_OGGCODEC_H diff --git a/engine/src/audio/codecs/OggData.h b/engine/src/audio/codecs/OggData.h index caebb7e9a0..d14cc9f6a1 100644 --- a/engine/src/audio/codecs/OggData.h +++ b/engine/src/audio/codecs/OggData.h @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +// NO HEADER GUARD // // C++ implementation: Audio::__impl::OggData diff --git a/engine/src/audio/codecs/OggStream.h b/engine/src/audio/codecs/OggStream.h index cda1b13a26..4c9d4f2d5b 100644 --- a/engine/src/audio/codecs/OggStream.h +++ b/engine/src/audio/codecs/OggStream.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_OGG_STREAM_H +#define VEGA_STRIKE_ENGINE_AUDIO_OGG_STREAM_H // // C++ Interface: Audio::Codec // -#ifndef __AUDIO_OGG_STREAM_H__INCLUDED__ -#define __AUDIO_OGG_STREAM_H__INCLUDED__ #ifdef HAVE_OGG @@ -93,6 +92,6 @@ class OggStream : public Stream { }; -#endif//HAVE_OGG +#endif //HAVE_OGG -#endif//__AUDIO_OGG_STREAM_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_OGG_STREAM_H diff --git a/engine/src/audio/renderers/OpenAL/BorrowedOpenALRenderer.h b/engine/src/audio/renderers/OpenAL/BorrowedOpenALRenderer.h index 596aba1023..348cbe6b0d 100644 --- a/engine/src/audio/renderers/OpenAL/BorrowedOpenALRenderer.h +++ b/engine/src/audio/renderers/OpenAL/BorrowedOpenALRenderer.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_RENDERERS_OPENAL_BORROWED_OPENAL_RENDERER_H +#define VEGA_STRIKE_ENGINE_AUDIO_RENDERERS_OPENAL_BORROWED_OPENAL_RENDERER_H // // C++ Interface: Audio::SceneManager // -#ifndef __AUDIO_BORROWED_OPENAL_RENDERER_H__INCLUDED__ -#define __AUDIO_BORROWED_OPENAL_RENDERER_H__INCLUDED__ #include "OpenALRenderer.h" #include "al.h" @@ -72,4 +71,4 @@ class BorrowedOpenALRenderer : public OpenALRenderer { }; -#endif//__AUDIO_BORROWED_OPENAL_RENDERER_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_RENDERERS_OPENAL_BORROWED_OPENAL_RENDERER_H diff --git a/engine/src/audio/renderers/OpenAL/OpenALHelpers.h b/engine/src/audio/renderers/OpenAL/OpenALHelpers.h index b54cc0500d..6c83ede753 100644 --- a/engine/src/audio/renderers/OpenAL/OpenALHelpers.h +++ b/engine/src/audio/renderers/OpenAL/OpenALHelpers.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __OPENAL_HELPERS_H__INCLUDED__ -#define __OPENAL_HELPERS_H__INCLUDED__ +#ifndef VEGA_STRIKE_ENGINE_AUDIO_RENDERERS_OPENAL_HELPERS_H +#define VEGA_STRIKE_ENGINE_AUDIO_RENDERERS_OPENAL_HELPERS_H #include "../../Exceptions.h" #include "al.h" @@ -47,4 +45,4 @@ ALenum asALFormat(const Format &format); } } -#endif//__OPENAL_HELPERS_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_RENDERERS_OPENAL_HELPERS_H diff --git a/engine/src/audio/renderers/OpenAL/OpenALRenderableListener.h b/engine/src/audio/renderers/OpenAL/OpenALRenderableListener.h index bb3978a161..5e0577ce9c 100644 --- a/engine/src/audio/renderers/OpenAL/OpenALRenderableListener.h +++ b/engine/src/audio/renderers/OpenAL/OpenALRenderableListener.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_RENDERERS_OPENAL_RENDERABLE_LISTENER_H +#define VEGA_STRIKE_ENGINE_AUDIO_RENDERERS_OPENAL_RENDERABLE_LISTENER_H // // C++ Interface: Audio::OpenALRenderableListener // -#ifndef __AUDIO_OPENALRENDERABLELISTENER_H__INCLUDED__ -#define __AUDIO_OPENALRENDERABLELISTENER_H__INCLUDED__ #include "../../RenderableListener.h" @@ -58,4 +57,4 @@ class OpenALRenderableListener : public RenderableListener { }; -#endif//__AUDIO_OPENALRENDERABLELISTENER_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_RENDERERS_OPENAL_RENDERABLE_LISTENER_H diff --git a/engine/src/audio/renderers/OpenAL/OpenALRenderableSource.h b/engine/src/audio/renderers/OpenAL/OpenALRenderableSource.h index 63eb08d8a5..f15bbb3a1e 100644 --- a/engine/src/audio/renderers/OpenAL/OpenALRenderableSource.h +++ b/engine/src/audio/renderers/OpenAL/OpenALRenderableSource.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_RENDERERS_OPENAL_RENDERABLE_SOURCE_H +#define VEGA_STRIKE_ENGINE_AUDIO_RENDERERS_OPENAL_RENDERABLE_SOURCE_H // // C++ Interface: Audio::OpenALRenderableSource // -#ifndef __AUDIO_OPENALRENDERABLESOURCE_H__INCLUDED__ -#define __AUDIO_OPENALRENDERABLESOURCE_H__INCLUDED__ #include "al.h" @@ -88,4 +87,4 @@ class OpenALRenderableSource : public RenderableSource { }; -#endif//__AUDIO_OPENALRENDERABLESOURCE_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_RENDERERS_OPENAL_RENDERABLE_SOURCE_H diff --git a/engine/src/audio/renderers/OpenAL/OpenALRenderableStreamingSource.h b/engine/src/audio/renderers/OpenAL/OpenALRenderableStreamingSource.h index ad95ad4a2e..1aafe9dd17 100644 --- a/engine/src/audio/renderers/OpenAL/OpenALRenderableStreamingSource.h +++ b/engine/src/audio/renderers/OpenAL/OpenALRenderableStreamingSource.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_RENDERERS_OPENAL_RENDERABLE_STREAMING_SOURCE_H +#define VEGA_STRIKE_ENGINE_AUDIO_RENDERERS_OPENAL_RENDERABLE_STREAMING_SOURCE_H // // C++ Interface: Audio::OpenALRenderableSource // -#ifndef __AUDIO_OPENALRENDERABLESTREAMINGSOURCE_H__INCLUDED__ -#define __AUDIO_OPENALRENDERABLESTREAMINGSOURCE_H__INCLUDED__ #include "al.h" @@ -103,4 +102,4 @@ class OpenALRenderableStreamingSource : public RenderableSource { }; -#endif//__AUDIO_OPENALRENDERABLESTREAMINGSOURCE_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_RENDERERS_OPENAL_RENDERABLE_STREAMING_SOURCE_H diff --git a/engine/src/audio/renderers/OpenAL/OpenALRenderer.h b/engine/src/audio/renderers/OpenAL/OpenALRenderer.h index af6871fbcb..cd1f811b64 100644 --- a/engine/src/audio/renderers/OpenAL/OpenALRenderer.h +++ b/engine/src/audio/renderers/OpenAL/OpenALRenderer.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_RENDERERS_OPENAL_RENDERER_H +#define VEGA_STRIKE_ENGINE_AUDIO_RENDERERS_OPENAL_RENDERER_H // // C++ Interface: Audio::SceneManager // -#ifndef __AUDIO_OPENAL_RENDERER_H__INCLUDED__ -#define __AUDIO_OPENAL_RENDERER_H__INCLUDED__ #include "../../Exceptions.h" #include "../../Types.h" @@ -112,4 +111,4 @@ class OpenALRenderer : public Renderer { }; -#endif//__AUDIO_OPENAL_RENDERER_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_RENDERERS_OPENAL_RENDERER_H diff --git a/engine/src/audio/renderers/OpenAL/OpenALSimpleSound.h b/engine/src/audio/renderers/OpenAL/OpenALSimpleSound.h index 6974d5675a..a0fa7ab617 100644 --- a/engine/src/audio/renderers/OpenAL/OpenALSimpleSound.h +++ b/engine/src/audio/renderers/OpenAL/OpenALSimpleSound.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_RENDERERS_OPENAL_SIMPLESOUND_H +#define VEGA_STRIKE_ENGINE_AUDIO_RENDERERS_OPENAL_SIMPLESOUND_H // // C++ Interface: Audio::OpenALSimpleSound // -#ifndef __AUDIO_OPENALSIMPLESOUND_H__INCLUDED__ -#define __AUDIO_OPENALSIMPLESOUND_H__INCLUDED__ #include "../../Exceptions.h" #include "../../Types.h" @@ -77,4 +76,4 @@ class OpenALSimpleSound : public SimpleSound { }; -#endif//__AUDIO_SIMPLESOUND_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_RENDERERS_OPENAL_SIMPLESOUND_H diff --git a/engine/src/audio/renderers/OpenAL/OpenALStreamingSound.h b/engine/src/audio/renderers/OpenAL/OpenALStreamingSound.h index 37e34f98cf..8e28fd82f8 100644 --- a/engine/src/audio/renderers/OpenAL/OpenALStreamingSound.h +++ b/engine/src/audio/renderers/OpenAL/OpenALStreamingSound.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_RENDERERS_OPENAL_STREAMING_SOUND_H +#define VEGA_STRIKE_ENGINE_AUDIO_RENDERERS_OPENAL_STREAMING_SOUND_H // // C++ Interface: Audio::OpenALSimpleSound // -#ifndef __AUDIO_OPENALSTREAMINGSOUND_H__INCLUDED__ -#define __AUDIO_OPENALSTREAMINGSOUND_H__INCLUDED__ #include "../../Exceptions.h" #include "../../Types.h" @@ -139,4 +138,4 @@ class OpenALStreamingSound : public SimpleSound { }; -#endif//__AUDIO_OPENALSTREAMINGSOUND_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_RENDERERS_OPENAL_STREAMING_SOUND_H diff --git a/engine/src/audio/renderers/OpenAL/al.h b/engine/src/audio/renderers/OpenAL/al.h index 19521f6540..2678a1a85f 100644 --- a/engine/src/audio/renderers/OpenAL/al.h +++ b/engine/src/audio/renderers/OpenAL/al.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __AL_INCLUDES__INCLUDED__ -#define __AL_INCLUDES__INCLUDED__ +#ifndef VEGA_STRIKE_ENGINE_AUDIO_RENDERERS_OPENAL_AL_H +#define VEGA_STRIKE_ENGINE_AUDIO_RENDERERS_OPENAL_AL_H #ifdef __APPLE__ #include <al.h> @@ -58,5 +56,4 @@ typedef ALuint ALBufferHandle; #define ALCstring ALCubyte* #endif -#endif//__AL_INCLUDES__INCLUDED__ - +#endif //VEGA_STRIKE_ENGINE_AUDIO_RENDERERS_OPENAL_AL_H diff --git a/engine/src/audio/test.h b/engine/src/audio/test.h index 601c6d2c1e..e093f71dcb 100644 --- a/engine/src/audio/test.h +++ b/engine/src/audio/test.h @@ -23,13 +23,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_AUDIO_TEST_H +#define VEGA_STRIKE_ENGINE_AUDIO_TEST_H // // C++ Interface: Audio::Source // -#ifndef __AUDIO_TEST_H__INCLUDED__ -#define __AUDIO_TEST_H__INCLUDED__ namespace Audio { namespace Test { @@ -37,4 +36,4 @@ namespace Audio { }; }; -#endif//__AUDIO_TEST_H__INCLUDED__ +#endif //VEGA_STRIKE_ENGINE_AUDIO_TEST_H diff --git a/engine/src/audio/utils.h b/engine/src/audio/utils.h index b390383902..eb303c6ec5 100644 --- a/engine/src/audio/utils.h +++ b/engine/src/audio/utils.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __AUDIO_UTILS_H__INCLUDED__ -#define __AUDIO_UTILS_H__INCLUDED__ +#ifndef VEGA_STRIKE_ENGINE_AUDIO_UTILS_H +#define VEGA_STRIKE_ENGINE_AUDIO_UTILS_H #include "Types.h" #include "Exceptions.h" @@ -94,5 +92,4 @@ T parseEnum(const std::string &s, const std::map<std::string, T> &enumMap, T def } -#endif//__AUDIO_UTILS_H__INCLUDED__ - +#endif //VEGA_STRIKE_ENGINE_AUDIO_UTILS_H diff --git a/engine/src/audiolib.h b/engine/src/audiolib.h index f61524c740..869ebc9cb5 100644 --- a/engine/src/audiolib.h +++ b/engine/src/audiolib.h @@ -19,9 +19,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_AUDIO_LIB_H +#define VEGA_STRIKE_ENGINE_AUDIO_LIB_H -#ifndef _AUDIO_LIB_H_ -#define _AUDIO_LIB_H_ #include "gfx/vec.h" #include <string> bool AUDInit(); @@ -80,5 +80,5 @@ float AUDGetCurrentPosition(const int sound); ///Gets current doppler val float AUDGetDoppler(); //#define PERFRAMESOUND -#endif +#endif //VEGA_STRIKE_ENGINE_AUDIO_LIB_H diff --git a/engine/src/cg_global.h b/engine/src/cg_global.h index 25f496eaa9..8f7a6e1446 100644 --- a/engine/src/cg_global.h +++ b/engine/src/cg_global.h @@ -22,10 +22,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _CG_GLOBAL_ -#define _CG_GLOBAL_ +#ifndef VEGA_STRIKE_ENGINE_CG_GLOBAL_H +#define VEGA_STRIKE_ENGINE_CG_GLOBAL_H #if defined (CG_SUPPORT) @@ -34,7 +32,7 @@ #elif !defined (WIN32) #define UNIX 1 -#endif +#endif //defined (__APPLE__) || defined (MACOSX) #include "gldrv/gl_globals.h" @@ -45,7 +43,7 @@ #include "gldrv/glx_undefined_extensions.h" #include <GL/glxext.h> -#endif +#endif //defined (UNIX) #include <string> @@ -91,6 +89,6 @@ class CG_Cloak extern CG_Cloak *cloak_cg; -#endif -#endif +#endif //defined (CG_SUPPORT) +#endif //VEGA_STRIKE_ENGINE_CG_GLOBAL_H diff --git a/engine/src/cmd/ai/aggressive.h b/engine/src/cmd/ai/aggressive.h index 076df4badc..4956b11eb5 100644 --- a/engine/src/cmd/ai/aggressive.h +++ b/engine/src/cmd/ai/aggressive.h @@ -23,10 +23,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_CMD_AI_AGGRESSIVE_H +#define VEGA_STRIKE_ENGINE_CMD_AI_AGGRESSIVE_H - -#ifndef __AGGRESSIVE_AI_H -#define __AGGRESSIVE_AI_H #include "fire.h" class Flightgroup; @@ -102,5 +101,4 @@ class AggressiveAI : public FireAt { }; } -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_AI_AGGRESSIVE_H diff --git a/engine/src/cmd/ai/autodocking.h b/engine/src/cmd/ai/autodocking.h index b12c6ae66a..0f2d352ea3 100644 --- a/engine/src/cmd/ai/autodocking.h +++ b/engine/src/cmd/ai/autodocking.h @@ -1,3 +1,4 @@ +// -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- /** * autodocking.h * @@ -23,12 +24,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -// -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- - -#ifndef VEGASTRIKE_CMD_AI_AUTODOCKING_H -#define VEGASTRIKE_CMD_AI_AUTODOCKING_H +#ifndef VEGA_STRIKE_ENGINE_CMD_AI_AUTO_DOCKING_H +#define VEGA_STRIKE_ENGINE_CMD_AI_AUTO_DOCKING_H #include <deque> #include <boost/shared_ptr.hpp> @@ -114,4 +111,4 @@ class AutoDocking : public Order { } // namespace Orders -#endif +#endif //VEGA_STRIKE_ENGINE_CMD_AI_AUTO_DOCKING_H diff --git a/engine/src/cmd/ai/comm_ai.h b/engine/src/cmd/ai/comm_ai.h index 2da0087624..7b5a62adba 100644 --- a/engine/src/cmd/ai/comm_ai.h +++ b/engine/src/cmd/ai/comm_ai.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __COMM_AI_H -#define __COMM_AI_H +#ifndef VEGA_STRIKE_ENGINE_CMD_AI_COMM_H +#define VEGA_STRIKE_ENGINE_CMD_AI_COMM_H #include "order.h" @@ -73,5 +71,4 @@ class CommunicatingAI : public Order { void AllUnitsCloseAndEngage(Unit *un, int faction); -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_AI_COMM_H diff --git a/engine/src/cmd/ai/communication.h b/engine/src/cmd/ai/communication.h index 4bb4f4f583..aa31ec28f2 100644 --- a/engine/src/cmd/ai/communication.h +++ b/engine/src/cmd/ai/communication.h @@ -22,10 +22,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_CMD_AI_COMMUNICATION_H +#define VEGA_STRIKE_ENGINE_CMD_AI_COMMUNICATION_H - -#ifndef _COMMUNICATION_H_ -#define _COMMUNICATION_H_ #include "cmd/unit_generic.h" #include "gfxlib_struct.h" #include "vs_logging.h" @@ -142,5 +141,4 @@ inline std::string GetRelationshipColorString(float rel) { unsigned int DoSpeech(Unit *un, Unit *player_un, const FSM::Node &node); -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_AI_COMMUNICATION_H diff --git a/engine/src/cmd/ai/docking.h b/engine/src/cmd/ai/docking.h index 2c2c46df8f..fd6346e4da 100644 --- a/engine/src/cmd/ai/docking.h +++ b/engine/src/cmd/ai/docking.h @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +// NO HEADER GUARD #include "navigation.h" namespace Orders { diff --git a/engine/src/cmd/ai/event_xml.h b/engine/src/cmd/ai/event_xml.h index e29f089038..da3e7106e2 100644 --- a/engine/src/cmd/ai/event_xml.h +++ b/engine/src/cmd/ai/event_xml.h @@ -23,10 +23,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_CMD_AI_EVENT_XML_H +#define VEGA_STRIKE_ENGINE_CMD_AI_EVENT_XML_H - -#ifndef _CMD_AI_EVENT_XML_H_ -#define _CMD_AI_EVENT_XML_H_ #include "xml_support.h" #include <string> #include <vector> @@ -91,5 +90,5 @@ struct ElemAttrMap { }; void LoadAI(const char *filename, ElemAttrMap &result, const std::string &faction); //num seconds } -#endif +#endif //VEGA_STRIKE_ENGINE_CMD_AI_EVENT_XML_H diff --git a/engine/src/cmd/ai/fire.h b/engine/src/cmd/ai/fire.h index 689ecd541e..e6755a30e6 100644 --- a/engine/src/cmd/ai/fire.h +++ b/engine/src/cmd/ai/fire.h @@ -23,10 +23,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_CMD_AI_FIRE_H +#define VEGA_STRIKE_ENGINE_CMD_AI_FIRE_H - -#ifndef _CMD_TARGET_AI_H_ -#define _CMD_TARGET_AI_H_ #include "comm_ai.h" #include "event_xml.h" //all unified AI's should inherit from FireAt, so they can choose targets together. @@ -95,5 +94,5 @@ class FireAt : public CommunicatingAI { virtual ~FireAt(); }; } -#endif +#endif //VEGA_STRIKE_ENGINE_CMD_AI_FIRE_H diff --git a/engine/src/cmd/ai/fireall.h b/engine/src/cmd/ai/fireall.h index d7a055da02..71ff1e835f 100644 --- a/engine/src/cmd/ai/fireall.h +++ b/engine/src/cmd/ai/fireall.h @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +// NO HEADER GUARD #include "order.h" namespace Orders { diff --git a/engine/src/cmd/ai/firekeyboard.h b/engine/src/cmd/ai/firekeyboard.h index 7827e75fa5..2ef5be8152 100644 --- a/engine/src/cmd/ai/firekeyboard.h +++ b/engine/src/cmd/ai/firekeyboard.h @@ -23,10 +23,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_CMD_AI_FIRE_KEYBOARD_H +#define VEGA_STRIKE_ENGINE_CMD_AI_FIRE_KEYBOARD_H - -#ifndef _CMD_KEYBOARD_AI_H_ -#define _CMD_KEYBOARD_AI_H_ #include "in.h" #include "order.h" #include "event_xml.h" @@ -174,5 +173,4 @@ class FireKeyboard : public Order { virtual ~FireKeyboard(); }; -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_AI_FIRE_KEYBOARD_H diff --git a/engine/src/cmd/ai/flybywire.h b/engine/src/cmd/ai/flybywire.h index 6081f31fec..14f13c66ed 100644 --- a/engine/src/cmd/ai/flybywire.h +++ b/engine/src/cmd/ai/flybywire.h @@ -23,10 +23,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_CMD_AI_FLY_BY_WIRE_H +#define VEGA_STRIKE_ENGINE_CMD_AI_FLY_BY_WIRE_H - -#ifndef _CMD_FLYBYWIRE_H_ -#define _CMD_FLYBYWIRE_H_ #include "order.h" #include "vs_globals.h" namespace Orders { @@ -232,5 +231,5 @@ class FlyByWire : public Orders::MatchVelocity { FlyByWire(const FlyByWire &); FlyByWire &operator=(const FlyByWire &); }; -#endif +#endif //VEGA_STRIKE_ENGINE_CMD_AI_FLY_BY_WIRE_H diff --git a/engine/src/cmd/ai/flyjoystick.h b/engine/src/cmd/ai/flyjoystick.h index 33336f6120..e6a82536d2 100644 --- a/engine/src/cmd/ai/flyjoystick.h +++ b/engine/src/cmd/ai/flyjoystick.h @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +// NO HEADER GUARD #include "flykeyboard.h" diff --git a/engine/src/cmd/ai/flykeyboard.h b/engine/src/cmd/ai/flykeyboard.h index 700e6c8976..40cc81d84c 100644 --- a/engine/src/cmd/ai/flykeyboard.h +++ b/engine/src/cmd/ai/flykeyboard.h @@ -23,10 +23,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_CMD_AI_FLY_KEYBOARD_H +#define VEGA_STRIKE_ENGINE_CMD_AI_FLY_KEYBOARD_H - -#ifndef _IN_AI_H_ -#define _IN_AI_H_ #include "in.h" #if defined (__APPLE__) || defined (MACOSX) #include <GLUT/glut.h> @@ -106,5 +105,4 @@ class FlyByKeyboard : public FlyByWire { void Execute(); }; -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_AI_FLY_KEYBOARD_H diff --git a/engine/src/cmd/ai/hard_coded_scripts.h b/engine/src/cmd/ai/hard_coded_scripts.h index bef38f751b..660454e7e4 100644 --- a/engine/src/cmd/ai/hard_coded_scripts.h +++ b/engine/src/cmd/ai/hard_coded_scripts.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef HARD_CODED_SCRIPTS_H_ -#define HARD_CODED_SCRIPTS_H_ +#ifndef VEGA_STRIKE_ENGINE_CMD_AI_HARD_CODED_SCRIPTS_H +#define VEGA_STRIKE_ENGINE_CMD_AI_HARD_CODED_SCRIPTS_H typedef void CCScript(Order *script, Unit *un); @@ -81,5 +79,5 @@ CCScript FacePerpendicularSlow; CCScript RollFacePerpendicularFast; CCScript RollFacePerpendicular; CCScript RollFacePerpendicularSlow; -#endif +#endif //VEGA_STRIKE_ENGINE_CMD_AI_HARD_CODED_SCRIPTS_H diff --git a/engine/src/cmd/ai/ikarus.h b/engine/src/cmd/ai/ikarus.h index 618512146c..ddcba681c9 100644 --- a/engine/src/cmd/ai/ikarus.h +++ b/engine/src/cmd/ai/ikarus.h @@ -23,10 +23,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_CMD_AI_IKARUS_H +#define VEGA_STRIKE_ENGINE_CMD_AI_IKARUS_H - -#ifndef _IKARUS_H_ -#define _IKARUS_H_ namespace Orders { class Ikarus : public AggressiveAI { void ExecuteStrategy(Unit *target); @@ -44,5 +43,4 @@ class Ikarus : public AggressiveAI { }; } -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_AI_IKARUS_H diff --git a/engine/src/cmd/ai/missionscript.h b/engine/src/cmd/ai/missionscript.h index d098981cd4..908e84e0c9 100644 --- a/engine/src/cmd/ai/missionscript.h +++ b/engine/src/cmd/ai/missionscript.h @@ -23,14 +23,13 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_CMD_AI_MISSION_SCRIPT_H +#define VEGA_STRIKE_ENGINE_CMD_AI_MISSION_SCRIPT_H /* * AI for mission scripting written by Alexander Rawass <alexannika@users.sourceforge.net> */ -#ifndef _CMD_AI_MISSION_SCRIPT_H_ -#define _CMD_AI_MISSION_SCRIPT_H_ #include "order.h" #include "navigation.h" @@ -110,5 +109,4 @@ class AIOrderList : public AImissionScript { olist_t *my_orderlist; }; -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_AI_MISSION_SCRIPT_H diff --git a/engine/src/cmd/ai/navigation.h b/engine/src/cmd/ai/navigation.h index 5c8321c307..2b67c7850f 100644 --- a/engine/src/cmd/ai/navigation.h +++ b/engine/src/cmd/ai/navigation.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _CMD_NAVIGATION_ORDERS_H_ -#define _CMD_NAVIGATION_ORDERS_H_ +#ifndef VEGA_STRIKE_ENGINE_CMD_AI_NAVIGATION_ORDERS_H +#define VEGA_STRIKE_ENGINE_CMD_AI_NAVIGATION_ORDERS_H #include "order.h" #include "vegastrike.h" @@ -260,5 +258,5 @@ class FaceDirection : public ChangeHeading { virtual ~FaceDirection(); }; } -#endif +#endif //VEGA_STRIKE_ENGINE_CMD_AI_NAVIGATION_ORDERS_H diff --git a/engine/src/cmd/ai/order.h b/engine/src/cmd/ai/order.h index 83c6b920e2..4a47df0e52 100644 --- a/engine/src/cmd/ai/order.h +++ b/engine/src/cmd/ai/order.h @@ -23,11 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _CMD_ORDER_H - -#define _CMD_ORDER_H +#ifndef VEGA_STRIKE_ENGINE_CMD_AI_ORDER_H +#define VEGA_STRIKE_ENGINE_CMD_AI_ORDER_H #include "gfx/vec.h" #include "cmd/container.h" @@ -270,5 +267,4 @@ class Sequence : public Order { } // namespace Orders -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_AI_ORDER_H diff --git a/engine/src/cmd/ai/pythonai.h b/engine/src/cmd/ai/pythonai.h index e728761a72..2a968879ee 100644 --- a/engine/src/cmd/ai/pythonai.h +++ b/engine/src/cmd/ai/pythonai.h @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +// NO HEADER GUARD #include <Python.h> #include "fire.h" @@ -49,4 +49,3 @@ class PythonAI : public FireAt { static PythonAI *Factory(const std::string &file); virtual ~PythonAI(); }; - diff --git a/engine/src/cmd/ai/script.h b/engine/src/cmd/ai/script.h index 832d7feb84..2351c10eda 100644 --- a/engine/src/cmd/ai/script.h +++ b/engine/src/cmd/ai/script.h @@ -23,10 +23,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_CMD_AI_SCRIPT_H +#define VEGA_STRIKE_ENGINE_CMD_AI_SCRIPT_H - -#ifndef _CMD_AISCRIPT_H_ -#define _CMD_AISCRIPT_H_ #include "order.h" #include "navigation.h" #include "xml_support.h" @@ -68,5 +67,4 @@ class AIScript : public Order { void Execute(); }; -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_AI_SCRIPT_H diff --git a/engine/src/cmd/ai/tactics.h b/engine/src/cmd/ai/tactics.h index 0a38183de2..57e1626030 100644 --- a/engine/src/cmd/ai/tactics.h +++ b/engine/src/cmd/ai/tactics.h @@ -23,10 +23,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_CMD_AI_TACTICS_H +#define VEGA_STRIKE_ENGINE_CMD_AI_TACTICS_H - -#ifndef TACTICS_H_ -#define TACTICS_H_ #include "order.h" class CloakFor : public Order { @@ -41,5 +40,4 @@ class CloakFor : public Order { ~CloakFor(); }; -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_AI_TACTICS_H diff --git a/engine/src/cmd/ai/turretai.h b/engine/src/cmd/ai/turretai.h index 29100ed91d..9763717640 100644 --- a/engine/src/cmd/ai/turretai.h +++ b/engine/src/cmd/ai/turretai.h @@ -23,10 +23,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_CMD_AI_TURRET_H +#define VEGA_STRIKE_ENGINE_CMD_AI_TURRET_H - -#ifndef _TURRETAI_H_ -#define _TURRETAI_H_ #include "navigation.h" namespace Orders { class TurretAI : public FaceTargetITTS { @@ -41,5 +40,5 @@ class TurretAI : public FaceTargetITTS { virtual void getAverageGunSpeed(float &speed, float &range, float &mrange) const; }; } -#endif +#endif //VEGA_STRIKE_ENGINE_CMD_AI_TURRET_H diff --git a/engine/src/cmd/ai/warpto.h b/engine/src/cmd/ai/warpto.h index d4723ae9fd..1551b8f69c 100644 --- a/engine/src/cmd/ai/warpto.h +++ b/engine/src/cmd/ai/warpto.h @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +// NO HEADER GUARD class Unit; bool DistanceWarrantsWarpTo(Unit *parent, diff --git a/engine/src/cmd/alphacurve.h b/engine/src/cmd/alphacurve.h index b531a6b18f..b82590691e 100644 --- a/engine/src/cmd/alphacurve.h +++ b/engine/src/cmd/alphacurve.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef _ALPHACURVE_H_ -#define _ALPHACURVE_H_ +#ifndef VEGA_STRIKE_ENGINE_CMD_ALPHA_CURVE_H +#define VEGA_STRIKE_ENGINE_CMD_ALPHA_CURVE_H #include <math.h> @@ -43,5 +42,4 @@ int get_alpha(int _query, int _tail_mode_start, int _tail_mode_end); -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_ALPHA_CURVE_H diff --git a/engine/src/cmd/armed.h b/engine/src/cmd/armed.h index abffec645b..2749d097e2 100644 --- a/engine/src/cmd/armed.h +++ b/engine/src/cmd/armed.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef ARMED_H -#define ARMED_H +#ifndef VEGA_STRIKE_ENGINE_CMD_ARMED_H +#define VEGA_STRIKE_ENGINE_CMD_ARMED_H #include "gfx/vec.h" #include "movable.h" @@ -83,4 +81,4 @@ class Armed { void UnFire(); }; -#endif // ARMED_H +#endif //VEGA_STRIKE_ENGINE_CMD_ARMED_H diff --git a/engine/src/cmd/asteroid.h b/engine/src/cmd/asteroid.h index f2d6a4971d..06eaa7e924 100644 --- a/engine/src/cmd/asteroid.h +++ b/engine/src/cmd/asteroid.h @@ -23,10 +23,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_CMD_ASTEROID_H +#define VEGA_STRIKE_ENGINE_CMD_ASTEROID_H - -#ifndef _ASTEROID_H_ -#define _ASTEROID_H_ #include "gfx/quaternion.h" #include "gfx/vec.h" #include "gfx/matrix.h" @@ -58,5 +57,5 @@ class Asteroid : public Unit { /// assignment operator forbidden Asteroid &operator=(const Asteroid &); }; -#endif +#endif //VEGA_STRIKE_ENGINE_CMD_ASTEROID_H diff --git a/engine/src/cmd/atmosphere.h b/engine/src/cmd/atmosphere.h index 28c36ce5d4..f938004927 100644 --- a/engine/src/cmd/atmosphere.h +++ b/engine/src/cmd/atmosphere.h @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +// NO HEADER GUARD #include "gfx/vec.h" #include "gfxlib_struct.h" diff --git a/engine/src/cmd/audible.h b/engine/src/cmd/audible.h index 3b26032d1e..3a6bfe7ad4 100644 --- a/engine/src/cmd/audible.h +++ b/engine/src/cmd/audible.h @@ -23,9 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef AUDIBLE_H -#define AUDIBLE_H +#ifndef VEGA_STRIKE_ENGINE_CMD_AUDIBLE_H +#define VEGA_STRIKE_ENGINE_CMD_AUDIBLE_H #include "gfx/vec.h" // TODO: replace with class Vector; #include <map> @@ -65,4 +64,4 @@ class Audible { void playDopplerSound(const Vector &pnt, int sound); }; -#endif // AUDIBLE_H +#endif //VEGA_STRIKE_ENGINE_CMD_AUDIBLE_H diff --git a/engine/src/cmd/base.h b/engine/src/cmd/base.h index f9f72f981a..ddc10cb653 100644 --- a/engine/src/cmd/base.h +++ b/engine/src/cmd/base.h @@ -23,10 +23,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_CMD_BASE_H +#define VEGA_STRIKE_ENGINE_CMD_BASE_H - -#ifndef __BASE_H__ -#define __BASE_H__ #include <vector> #include <string> #include "basecomputer.h" @@ -420,5 +419,4 @@ class BaseInterface { } }; -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_BASE_H diff --git a/engine/src/cmd/base_util.h b/engine/src/cmd/base_util.h index 48a3415e82..7216037dd8 100644 --- a/engine/src/cmd/base_util.h +++ b/engine/src/cmd/base_util.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _BASE_UTIL_H_ -#define _BASE_UTIL_H_ +#ifndef VEGA_STRIKE_ENGINE_CMD_BASE_UTIL_H +#define VEGA_STRIKE_ENGINE_CMD_BASE_UTIL_H #include <string> #include <boost/version.hpp> @@ -180,4 +178,4 @@ void refreshBaseComputerUI(const class Cargo *dirtyCarg); void ExitGame(); } -#endif +#endif //VEGA_STRIKE_ENGINE_CMD_BASE_UTIL_H diff --git a/engine/src/cmd/basecomputer.h b/engine/src/cmd/basecomputer.h index c44239fe67..48b06b0f22 100644 --- a/engine/src/cmd/basecomputer.h +++ b/engine/src/cmd/basecomputer.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __BASECOMPUTER_H__ -#define __BASECOMPUTER_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_BASECOMPUTER_H +#define VEGA_STRIKE_ENGINE_CMD_BASECOMPUTER_H #include "gui/windowcontroller.h" #include "cmd/unit_generic.h" @@ -325,5 +323,4 @@ class BaseComputer : public WctlBase<BaseComputer> { bool buyShip(Unit *base, Unit *player, std::string, bool myfleet, bool force_base_inventory, BaseComputer *); bool sellShip(Unit *base, Unit *player, std::string, BaseComputer *); -#endif //__BASECOMPUTER_H__ - +#endif //VEGA_STRIKE_ENGINE_CMD_BASECOMPUTER_H diff --git a/engine/src/cmd/beam.h b/engine/src/cmd/beam.h index e93f895577..afa4c9f1c0 100644 --- a/engine/src/cmd/beam.h +++ b/engine/src/cmd/beam.h @@ -23,10 +23,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_CMD_BEAM_H +#define VEGA_STRIKE_ENGINE_CMD_BEAM_H - -#ifndef _CMD_BEAM_H_ -#define _CMD_BEAM_H_ #include "gfx/mesh.h" #include "unit_collide.h" #include "gfx/matrix.h" @@ -115,5 +114,4 @@ class Beam { Unit *superunit); }; -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_BEAM_H diff --git a/engine/src/cmd/bolt.h b/engine/src/cmd/bolt.h index 20554e113d..96e7a841eb 100644 --- a/engine/src/cmd/bolt.h +++ b/engine/src/cmd/bolt.h @@ -23,10 +23,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_CMD_BOLT_H +#define VEGA_STRIKE_ENGINE_CMD_BOLT_H - -#ifndef _CMD_BOLT_H_ -#define _CMD_BOLT_H_ #include "gfxlib.h" #include "gfxlib_struct.h" #include "weapon_info.h" @@ -95,4 +94,4 @@ class Bolt { } }; -#endif +#endif //VEGA_STRIKE_ENGINE_CMD_BOLT_H diff --git a/engine/src/cmd/briefing.h b/engine/src/cmd/briefing.h index ba643790d5..f913eee10f 100644 --- a/engine/src/cmd/briefing.h +++ b/engine/src/cmd/briefing.h @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +// NO HEADER GUARD #include "gfx/matrix.h" #include "gfx/camera.h" diff --git a/engine/src/cmd/building.h b/engine/src/cmd/building.h index 174851873e..025c211374 100644 --- a/engine/src/cmd/building.h +++ b/engine/src/cmd/building.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __BUILDING_H -#define __BUILDING_H +#ifndef VEGA_STRIKE_ENGINE_CMD_BUILDING_H +#define VEGA_STRIKE_ENGINE_CMD_BUILDING_H #include "unit_generic.h" @@ -91,5 +89,4 @@ class Building : public Unit { Building &operator=(const Building &); }; -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_BUILDING_H diff --git a/engine/src/cmd/cargo.h b/engine/src/cmd/cargo.h index dfddc44722..bfcef54034 100644 --- a/engine/src/cmd/cargo.h +++ b/engine/src/cmd/cargo.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef CARGO_H -#define CARGO_H +#ifndef VEGA_STRIKE_ENGINE_CMD_CARGO_H +#define VEGA_STRIKE_ENGINE_CMD_CARGO_H #include "SharedPool.h" #include "gfxlib_struct.h" @@ -96,4 +94,4 @@ class CargoColor { } }; -#endif // CARGO_H +#endif //VEGA_STRIKE_ENGINE_CMD_CARGO_H diff --git a/engine/src/cmd/carrier.h b/engine/src/cmd/carrier.h index 6ee0b05c81..5034cb94cf 100644 --- a/engine/src/cmd/carrier.h +++ b/engine/src/cmd/carrier.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef CARRIER_H -#define CARRIER_H +#ifndef VEGA_STRIKE_ENGINE_CMD_CARRIER_H +#define VEGA_STRIKE_ENGINE_CMD_CARRIER_H #include "cargo.h" @@ -67,4 +65,4 @@ class Carrier { float getHiddenCargoVolume(void) const; }; -#endif // CARRIER_H +#endif //VEGA_STRIKE_ENGINE_CMD_CARRIER_H diff --git a/engine/src/cmd/click_list.h b/engine/src/cmd/click_list.h index 37138ab232..eeeca197cb 100644 --- a/engine/src/cmd/click_list.h +++ b/engine/src/cmd/click_list.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _GFX_CLICK_LIST_H_ -#define _GFX_CLICK_LIST_H_ +#ifndef VEGA_STRIKE_ENGINE_CMD_GFX_CLICK_LIST_H +#define VEGA_STRIKE_ENGINE_CMD_GFX_CLICK_LIST_H //#include "vegastrike.h" #include "gfx/matrix.h" @@ -52,5 +50,4 @@ class ClickList { UnitCollection *requestIterator(int minX, int minY, int maxX, int maxY); Unit *requestShip(int mouseX, int mouseY); }; -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_GFX_CLICK_LIST_H diff --git a/engine/src/cmd/collection.h b/engine/src/cmd/collection.h index e8051cf81d..0af0387415 100644 --- a/engine/src/cmd/collection.h +++ b/engine/src/cmd/collection.h @@ -23,15 +23,13 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_CMD_UNIT_COLLECTION_H +#define VEGA_STRIKE_ENGINE_CMD_UNIT_COLLECTION_H /* unitCollection.h * *****/ -#ifndef _UNITCOLLECTION_H_ -#define _UNITCOLLECTION_H_ - //Collection type: //#define USE_OLD_COLLECTION #define USE_STL_COLLECTION @@ -317,5 +315,4 @@ typedef UnitCollection::ConstIterator un_fkiter; #error "No collection type chosen in collection.h:10" #endif //USE_STL_COLLECTION -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_UNIT_COLLECTION_H diff --git a/engine/src/cmd/collide.h b/engine/src/cmd/collide.h index ddf5c26315..205080c5f5 100644 --- a/engine/src/cmd/collide.h +++ b/engine/src/cmd/collide.h @@ -22,10 +22,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __COLLIDE_FUNCS_H -#define __COLLIDE_FUNCS_H +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLIDE_FUNCS_H +#define VEGA_STRIKE_ENGINE_CMD_COLLIDE_FUNCS_H #include "gfx/vec.h" #include "linecollide.h" @@ -38,5 +36,4 @@ bool EradicateCollideTable(LineCollide *lc, StarSystem *ss); void AddCollideQueue(LineCollide &tmp, StarSystem *ss); bool lcwithin(const LineCollide &lc, const LineCollide &tmp); -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_COLLIDE_FUNCS_H diff --git a/engine/src/cmd/collide2/CSopcodecollider.h b/engine/src/cmd/collide2/CSopcodecollider.h index 9c8296f2fe..e5e20b70f1 100644 --- a/engine/src/cmd/collide2/CSopcodecollider.h +++ b/engine/src/cmd/collide2/CSopcodecollider.h @@ -29,9 +29,9 @@ * Copyright (C) 2020-2022 Stephen G. Tuggy */ -#ifndef __VS_OPCODECOL_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPCODECOL_H #include "Stdafx.h" -#define __VS_OPCODECOL_H__ +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPCODECOL_H #include "csgeom2/opmatrix3.h" #include "csgeom2/opvector3.h" #include "csgeom2/opbox.h" @@ -166,4 +166,4 @@ class csOPCODECollider { } }; -#endif +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPCODECOL_H diff --git a/engine/src/cmd/collide2/Ice/IceAABB.h b/engine/src/cmd/collide2/Ice/IceAABB.h index 37169793de..82dd9db4dc 100644 --- a/engine/src/cmd/collide2/Ice/IceAABB.h +++ b/engine/src/cmd/collide2/Ice/IceAABB.h @@ -16,8 +16,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __ICEAABB_H__ -#define __ICEAABB_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_AABB_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_AABB_H // Forward declarations class Sphere; @@ -598,4 +598,4 @@ inline_ void ComputeAABB(AABB &aabb, const Point *list, uint32_t nb_pts) { } } -#endif // __ICEAABB_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_AABB_H diff --git a/engine/src/cmd/collide2/Ice/IceAxes.h b/engine/src/cmd/collide2/Ice/IceAxes.h index fc8df45812..bb3f334971 100644 --- a/engine/src/cmd/collide2/Ice/IceAxes.h +++ b/engine/src/cmd/collide2/Ice/IceAxes.h @@ -16,8 +16,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __ICEAXES_H__ -#define __ICEAXES_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_AXES_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_AXES_H enum PointComponent { _X = 0, @@ -56,4 +56,4 @@ class ICEMATHS_API Axes { uint32_t mAxis2; }; -#endif // __ICEAXES_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_AXES_H diff --git a/engine/src/cmd/collide2/Ice/IceBoundingSphere.h b/engine/src/cmd/collide2/Ice/IceBoundingSphere.h index a06171c504..6a459ab1ff 100644 --- a/engine/src/cmd/collide2/Ice/IceBoundingSphere.h +++ b/engine/src/cmd/collide2/Ice/IceBoundingSphere.h @@ -16,8 +16,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __ICEBOUNDINGSPHERE_H__ -#define __ICEBOUNDINGSPHERE_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_BOUNDING_SPHERE_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_BOUNDING_SPHERE_H enum BSphereMethod { BS_NONE, @@ -203,4 +203,4 @@ class ICEMATHS_API Sphere { float mRadius; //!< Sphere radius }; -#endif // __ICEBOUNDINGSPHERE_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_BOUNDING_SPHERE_H diff --git a/engine/src/cmd/collide2/Ice/IceContainer.h b/engine/src/cmd/collide2/Ice/IceContainer.h index 8a5c83fa46..a22a3ef2ac 100644 --- a/engine/src/cmd/collide2/Ice/IceContainer.h +++ b/engine/src/cmd/collide2/Ice/IceContainer.h @@ -16,8 +16,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __ICECONTAINER_H__ -#define __ICECONTAINER_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_CONTAINER_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_CONTAINER_H #define CONTAINER_STATS @@ -257,4 +257,4 @@ class ICECORE_API Container { float mGrowthFactor; //!< Resize: new number of entries = old number * mGrowthFactor }; -#endif // __ICECONTAINER_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_CONTAINER_H diff --git a/engine/src/cmd/collide2/Ice/IceFPU.h b/engine/src/cmd/collide2/Ice/IceFPU.h index b5697c988b..37043f43e9 100644 --- a/engine/src/cmd/collide2/Ice/IceFPU.h +++ b/engine/src/cmd/collide2/Ice/IceFPU.h @@ -12,8 +12,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __ICEFPU_H__ -#define __ICEFPU_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_FPU_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_FPU_H #define SIGN_BITMASK 0x80000000 @@ -72,4 +72,4 @@ inline_ bool IsValidFloat(float value) { #define CHECK_VALID_FLOAT(x) OPASSERT(IsValidFloat(x)); -#endif // __ICEFPU_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_FPU_H diff --git a/engine/src/cmd/collide2/Ice/IceHPoint.h b/engine/src/cmd/collide2/Ice/IceHPoint.h index 0aaea3f340..9119b020cd 100644 --- a/engine/src/cmd/collide2/Ice/IceHPoint.h +++ b/engine/src/cmd/collide2/Ice/IceHPoint.h @@ -11,8 +11,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __ICEHPOINT_H__ -#define __ICEHPOINT_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_HPOINT_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_HPOINT_H class ICEMATHS_API HPoint : public Point { public: @@ -305,5 +305,4 @@ class ICEMATHS_API HPoint : public Point { float w; }; -#endif // __ICEHPOINT_H__ - +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_HPOINT_H diff --git a/engine/src/cmd/collide2/Ice/IceIndexedTriangle.h b/engine/src/cmd/collide2/Ice/IceIndexedTriangle.h index 26f71fa891..ae6d2bc52b 100644 --- a/engine/src/cmd/collide2/Ice/IceIndexedTriangle.h +++ b/engine/src/cmd/collide2/Ice/IceIndexedTriangle.h @@ -16,8 +16,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __ICEINDEXEDTRIANGLE_H__ -#define __ICEINDEXEDTRIANGLE_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_INDEXED_TRIANGLE_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_INDEXED_TRIANGLE_H // An indexed triangle class. class IndexedTriangle { @@ -81,4 +81,4 @@ class IndexedTriangle { bool Equal(const IndexedTriangle &tri) const; }; -#endif // __ICEINDEXEDTRIANGLE_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_INDEXED_TRIANGLE_H diff --git a/engine/src/cmd/collide2/Ice/IceLSS.h b/engine/src/cmd/collide2/Ice/IceLSS.h index aa3d566a40..8178a95015 100644 --- a/engine/src/cmd/collide2/Ice/IceLSS.h +++ b/engine/src/cmd/collide2/Ice/IceLSS.h @@ -11,8 +11,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __ICELSS_H__ -#define __ICELSS_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_LSS_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_LSS_H class ICEMATHS_API LSS : public Segment { public: @@ -79,4 +79,4 @@ class ICEMATHS_API LSS : public Segment { float mRadius; //!< Sphere radius }; -#endif // __ICELSS_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_LSS_H diff --git a/engine/src/cmd/collide2/Ice/IceMatrix3x3.h b/engine/src/cmd/collide2/Ice/IceMatrix3x3.h index efb9abd629..a0b66a1bdb 100644 --- a/engine/src/cmd/collide2/Ice/IceMatrix3x3.h +++ b/engine/src/cmd/collide2/Ice/IceMatrix3x3.h @@ -16,8 +16,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __ICEMATRIX3X3_H__ -#define __ICEMATRIX3X3_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_MATRIX_3X3_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_MATRIX_3X3_H // Forward declarations class Quat; @@ -657,5 +657,4 @@ class ICEMATHS_API Matrix3x3 { float m[3][3]; }; -#endif // __ICEMATRIX3X3_H__ - +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_MATRIX_3X3_H diff --git a/engine/src/cmd/collide2/Ice/IceMatrix4x4.h b/engine/src/cmd/collide2/Ice/IceMatrix4x4.h index 56966196df..da32a823c1 100644 --- a/engine/src/cmd/collide2/Ice/IceMatrix4x4.h +++ b/engine/src/cmd/collide2/Ice/IceMatrix4x4.h @@ -16,8 +16,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __ICEMATRIX4X4_H__ -#define __ICEMATRIX4X4_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_MATRIX_4X4_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_MATRIX_4X4_H // Forward declarations class PRS; @@ -685,5 +685,4 @@ inline_ void TransformPoint3x3(Point &dest, const Point &source, const Matrix4x4 void InvertPRMatrix(Matrix4x4 &dest, const Matrix4x4 &src); -#endif // __ICEMATRIX4X4_H__ - +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_MATRIX_4X4_H diff --git a/engine/src/cmd/collide2/Ice/IceMemoryMacros.h b/engine/src/cmd/collide2/Ice/IceMemoryMacros.h index 95b6fbe983..2dae1bb375 100644 --- a/engine/src/cmd/collide2/Ice/IceMemoryMacros.h +++ b/engine/src/cmd/collide2/Ice/IceMemoryMacros.h @@ -12,8 +12,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __ICEMEMORYMACROS_H__ -#define __ICEMEMORYMACROS_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_MEMORY_MACROS_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_MEMORY_MACROS_H #undef ZeroMemory #undef CopyMemory @@ -143,4 +143,4 @@ inline void SAFE_DESTRUCT(T *&x) { // //! Standard allocation cycle #define SAFE_ALLOC(ptr, type, count) DELETEARRAY(ptr); ptr = new type[count]; CHECKALLOC(ptr); -#endif // __ICEMEMORYMACROS_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_MEMORY_MACROS_H diff --git a/engine/src/cmd/collide2/Ice/IceOBB.h b/engine/src/cmd/collide2/Ice/IceOBB.h index 2f0f9add73..da8d63a162 100644 --- a/engine/src/cmd/collide2/Ice/IceOBB.h +++ b/engine/src/cmd/collide2/Ice/IceOBB.h @@ -16,8 +16,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __ICEOBB_H__ -#define __ICEOBB_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_OBB_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_OBB_H // Forward declarations class LSS; @@ -194,4 +194,4 @@ class ICEMATHS_API OBB { // i.e. rows = eigen vectors of the covariance matrix }; -#endif // __ICEOBB_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_OBB_H diff --git a/engine/src/cmd/collide2/Ice/IcePairs.h b/engine/src/cmd/collide2/Ice/IcePairs.h index bac5d2da82..50b2b2fa7c 100644 --- a/engine/src/cmd/collide2/Ice/IcePairs.h +++ b/engine/src/cmd/collide2/Ice/IcePairs.h @@ -16,8 +16,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __ICEPAIRS_H__ -#define __ICEPAIRS_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_PAIRS_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_PAIRS_H //! A generic couple structure struct ICECORE_API Pair { @@ -74,4 +74,4 @@ class ICECORE_API Pairs : private Container { } }; -#endif // __ICEPAIRS_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_PAIRS_H diff --git a/engine/src/cmd/collide2/Ice/IcePlane.h b/engine/src/cmd/collide2/Ice/IcePlane.h index 0a034aab72..680626e0cb 100644 --- a/engine/src/cmd/collide2/Ice/IcePlane.h +++ b/engine/src/cmd/collide2/Ice/IcePlane.h @@ -11,8 +11,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __ICEPLANE_H__ -#define __ICEPLANE_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_PLANE_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_PLANE_H #define PLANE_EPSILON (1.0e-7f) @@ -144,4 +144,4 @@ inline_ void TransformPlane(Plane &plane, const Matrix4x4 &transform) { plane.d -= Point(transform.GetTrans()) | plane.n; } -#endif // __ICEPLANE_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_PLANE_H diff --git a/engine/src/cmd/collide2/Ice/IcePoint.h b/engine/src/cmd/collide2/Ice/IcePoint.h index a69d7a0907..d4570fcde5 100644 --- a/engine/src/cmd/collide2/Ice/IcePoint.h +++ b/engine/src/cmd/collide2/Ice/IcePoint.h @@ -29,8 +29,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __ICEPOINT_H__ -#define __ICEPOINT_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_POINT_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_POINT_H // Forward declarations class HPoint; @@ -773,4 +773,4 @@ class ICEMATHS_API Point { FUNCTION ICEMATHS_API void Normalize1(Point &a); FUNCTION ICEMATHS_API void Normalize2(Point &a); -#endif //__ICEPOINT_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_POINT_H diff --git a/engine/src/cmd/collide2/Ice/IcePreprocessor.h b/engine/src/cmd/collide2/Ice/IcePreprocessor.h index 7e5c781a90..0b68061d8b 100644 --- a/engine/src/cmd/collide2/Ice/IcePreprocessor.h +++ b/engine/src/cmd/collide2/Ice/IcePreprocessor.h @@ -11,8 +11,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __ICEPREPROCESSOR_H__ -#define __ICEPREPROCESSOR_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_PREPROCESSOR_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_PREPROCESSOR_H // Check platform #if defined( _WIN32 ) || defined( WIN32 ) @@ -114,4 +114,4 @@ #undef _X #endif -#endif // __ICEPREPROCESSOR_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_PREPROCESSOR_H diff --git a/engine/src/cmd/collide2/Ice/IceRandom.h b/engine/src/cmd/collide2/Ice/IceRandom.h index 48c8e8129d..3cd439302a 100644 --- a/engine/src/cmd/collide2/Ice/IceRandom.h +++ b/engine/src/cmd/collide2/Ice/IceRandom.h @@ -16,8 +16,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __ICERANDOM_H__ -#define __ICERANDOM_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_RANDOM_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_RANDOM_H ICECORE_API void SRand(uint32_t seed); uint32_t Rand(); @@ -57,5 +57,4 @@ class ICECORE_API BasicRandom { uint32_t mRnd; }; -#endif // __ICERANDOM_H__ - +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_RANDOM_H diff --git a/engine/src/cmd/collide2/Ice/IceRay.h b/engine/src/cmd/collide2/Ice/IceRay.h index 041f5e2335..749c77e05a 100644 --- a/engine/src/cmd/collide2/Ice/IceRay.h +++ b/engine/src/cmd/collide2/Ice/IceRay.h @@ -16,8 +16,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __ICERAY_H__ -#define __ICERAY_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_RAY_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_RAY_H class ICEMATHS_API Ray { public: @@ -105,4 +105,4 @@ inline_ void ComputeLocalRay(Ray &local_ray, const Ray &world_ray, const Matrix4 ComputeLocalPoint(local_ray.mOrig, world_ray.mOrig, world); } -#endif // __ICERAY_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_RAY_H diff --git a/engine/src/cmd/collide2/Ice/IceRevisitedRadix.h b/engine/src/cmd/collide2/Ice/IceRevisitedRadix.h index 31ae2a635f..19f5c764f7 100644 --- a/engine/src/cmd/collide2/Ice/IceRevisitedRadix.h +++ b/engine/src/cmd/collide2/Ice/IceRevisitedRadix.h @@ -16,8 +16,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __ICERADIXSORT_H__ -#define __ICERADIXSORT_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_RADIXSORT_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_RADIXSORT_H //! Allocate histograms & offsets locally #define RADIX_LOCAL_RAM @@ -75,4 +75,4 @@ class ICECORE_API RadixSort { bool Resize(uint32_t nb); }; -#endif // __ICERADIXSORT_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_RADIXSORT_H diff --git a/engine/src/cmd/collide2/Ice/IceSegment.h b/engine/src/cmd/collide2/Ice/IceSegment.h index a69ac2215e..d0e9ad5cfc 100644 --- a/engine/src/cmd/collide2/Ice/IceSegment.h +++ b/engine/src/cmd/collide2/Ice/IceSegment.h @@ -16,8 +16,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __ICESEGMENT_H__ -#define __ICESEGMENT_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_SEGMENT_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_SEGMENT_H class ICEMATHS_API Segment { public: @@ -80,4 +80,4 @@ class ICEMATHS_API Segment { Point mP1; //!< End of segment }; -#endif // __ICESEGMENT_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_SEGMENT_H diff --git a/engine/src/cmd/collide2/Ice/IceTriangle.h b/engine/src/cmd/collide2/Ice/IceTriangle.h index 7a2410839e..80360eb90e 100644 --- a/engine/src/cmd/collide2/Ice/IceTriangle.h +++ b/engine/src/cmd/collide2/Ice/IceTriangle.h @@ -16,8 +16,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __ICETRIANGLE_H__ -#define __ICETRIANGLE_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_TRIANGLE_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_TRIANGLE_H // Forward declarations class Moment; @@ -79,4 +79,4 @@ class ICEMATHS_API Triangle { void Inflate(float fat_coeff, bool constant_border); }; -#endif // __ICETRIANGLE_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_TRIANGLE_H diff --git a/engine/src/cmd/collide2/Ice/IceTrilist.h b/engine/src/cmd/collide2/Ice/IceTrilist.h index f5dcea0c9b..e095086d8d 100644 --- a/engine/src/cmd/collide2/Ice/IceTrilist.h +++ b/engine/src/cmd/collide2/Ice/IceTrilist.h @@ -16,8 +16,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __ICETRILIST_H__ -#define __ICETRILIST_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_TRILIST_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_TRILIST_H class ICEMATHS_API TriList : public Container { public: @@ -75,4 +75,4 @@ class ICEMATHS_API TriangleList : public Container { } }; -#endif //__ICETRILIST_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_TRILIST_H diff --git a/engine/src/cmd/collide2/Ice/IceTypes.h b/engine/src/cmd/collide2/Ice/IceTypes.h index 30978c0443..2f22131be9 100644 --- a/engine/src/cmd/collide2/Ice/IceTypes.h +++ b/engine/src/cmd/collide2/Ice/IceTypes.h @@ -16,8 +16,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __ICETYPES_H__ -#define __ICETYPES_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_TYPES_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_TYPES_H #define USE_HANDLE_MANAGER @@ -182,4 +182,4 @@ inline_ void TSetMax(T &a, const T &b) { # define drand48() ((double) (((double) rand()) / ((double) RAND_MAX))) #endif -#endif // __ICETYPES_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_TYPES_H diff --git a/engine/src/cmd/collide2/Ice/IceUtils.h b/engine/src/cmd/collide2/Ice/IceUtils.h index 521685cdf7..143bdaf6a0 100644 --- a/engine/src/cmd/collide2/Ice/IceUtils.h +++ b/engine/src/cmd/collide2/Ice/IceUtils.h @@ -16,8 +16,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __ICEUTILS_H__ -#define __ICEUTILS_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_UTILS_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_UTILS_H #define START_RUNONCE { static bool __RunOnce__ = false; if(!__RunOnce__){ #define END_RUNONCE __RunOnce__ = true;}} @@ -295,4 +295,4 @@ inline_ void Compute3DCoords(uint32_t &u, uint32_t &v, uint32_t &w, uint32_t i, Compute2DCoords(u, v, i - (w * nbu_nbv), nbu); } -#endif // __ICEUTILS_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_UTILS_H diff --git a/engine/src/cmd/collide2/Ice/Stdafx.h b/engine/src/cmd/collide2/Ice/Stdafx.h index 7f9869ca0e..48766e72db 100644 --- a/engine/src/cmd/collide2/Ice/Stdafx.h +++ b/engine/src/cmd/collide2/Ice/Stdafx.h @@ -1 +1,2 @@ +// NO HEADER GUARD #include "cmd/collide2/Stdafx.h" diff --git a/engine/src/cmd/collide2/OPC_AABBCollider.h b/engine/src/cmd/collide2/OPC_AABBCollider.h index e17c965e89..1717979009 100644 --- a/engine/src/cmd/collide2/OPC_AABBCollider.h +++ b/engine/src/cmd/collide2/OPC_AABBCollider.h @@ -19,8 +19,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __OPC_AABBCOLLIDER_H__ -#define __OPC_AABBCOLLIDER_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_AABBCOLLIDER_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_AABBCOLLIDER_H struct OPCODE_API AABBCache : VolumeCache { AABBCache() : FatCoeff(1.1f) { @@ -92,4 +92,4 @@ class OPCODE_API HybridAABBCollider : public AABBCollider { Container mTouchedBoxes; }; -#endif // __OPC_AABBCOLLIDER_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_AABBCOLLIDER_H diff --git a/engine/src/cmd/collide2/OPC_AABBTree.h b/engine/src/cmd/collide2/OPC_AABBTree.h index 34600c3463..56c2a854be 100644 --- a/engine/src/cmd/collide2/OPC_AABBTree.h +++ b/engine/src/cmd/collide2/OPC_AABBTree.h @@ -24,8 +24,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __OPC_AABBTREE_H__ -#define __OPC_AABBTREE_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_AABBTREE_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_AABBTREE_H #ifdef OPC_NO_NEG_VANILLA_TREE //! TO BE DOCUMENTED @@ -150,4 +150,4 @@ class OPCODE_API AABBTree : public AABBTreeNode { uint32_t mTotalNbNodes; //!< Number of nodes in the tree. }; -#endif // __OPC_AABBTREE_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_AABBTREE_H diff --git a/engine/src/cmd/collide2/OPC_BaseModel.h b/engine/src/cmd/collide2/OPC_BaseModel.h index f3b45e867b..a1e8b5592a 100644 --- a/engine/src/cmd/collide2/OPC_BaseModel.h +++ b/engine/src/cmd/collide2/OPC_BaseModel.h @@ -24,8 +24,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __OPC_BASEMODEL_H__ -#define __OPC_BASEMODEL_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_OPC_BASEMODEL_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_OPC_BASEMODEL_H //! Model creation structure struct OPCODE_API OPCODECREATE { @@ -196,4 +196,4 @@ class OPCODE_API BaseModel { bool CreateTree(bool no_leaf, bool quantized); }; -#endif //__OPC_BASEMODEL_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_OPC_BASEMODEL_H diff --git a/engine/src/cmd/collide2/OPC_BoxBoxOverlap.h b/engine/src/cmd/collide2/OPC_BoxBoxOverlap.h index 7d4d340783..df6bab2e97 100644 --- a/engine/src/cmd/collide2/OPC_BoxBoxOverlap.h +++ b/engine/src/cmd/collide2/OPC_BoxBoxOverlap.h @@ -19,6 +19,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +// NO HEADER GUARD /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** diff --git a/engine/src/cmd/collide2/OPC_BoxPruning.h b/engine/src/cmd/collide2/OPC_BoxPruning.h index fe20a9762f..dc05d64c2a 100644 --- a/engine/src/cmd/collide2/OPC_BoxPruning.h +++ b/engine/src/cmd/collide2/OPC_BoxPruning.h @@ -24,8 +24,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __OPC_BOXPRUNING_H__ -#define __OPC_BOXPRUNING_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_BOXPRUNING_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_BOXPRUNING_H // Optimized versions FUNCTION OPCODE_API bool CompleteBoxPruning(uint32_t nb, const AABB **array, Pairs &pairs, const Axes &axes); @@ -44,4 +44,4 @@ FUNCTION OPCODE_API bool BruteForceBipartiteBoxTest(uint32_t nb0, const AABB **array1, Pairs &pairs); -#endif //__OPC_BOXPRUNING_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_BOXPRUNING_H diff --git a/engine/src/cmd/collide2/OPC_Collider.h b/engine/src/cmd/collide2/OPC_Collider.h index 573024de5c..8ceb772140 100644 --- a/engine/src/cmd/collide2/OPC_Collider.h +++ b/engine/src/cmd/collide2/OPC_Collider.h @@ -24,8 +24,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __OPC_COLLIDER_H__ -#define __OPC_COLLIDER_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_COLLIDER_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_COLLIDER_H enum CollisionFlag { OPC_FIRST_CONTACT = (1 << 0), //!< Report all contacts (false) or only first one (true) @@ -200,4 +200,4 @@ class OPCODE_API Collider { } }; -#endif // __OPC_COLLIDER_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_COLLIDER_H diff --git a/engine/src/cmd/collide2/OPC_Common.h b/engine/src/cmd/collide2/OPC_Common.h index f05e549c86..de1a969872 100644 --- a/engine/src/cmd/collide2/OPC_Common.h +++ b/engine/src/cmd/collide2/OPC_Common.h @@ -24,8 +24,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __OPC_COMMON_H__ -#define __OPC_COMMON_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_COMMON_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_COMMON_H // [GOTTFRIED]: Just a small change for readability. #ifdef OPC_CPU_COMPARE @@ -131,4 +131,4 @@ inline_ void TransformPoint(Point &dest, const Point &source, const Matrix3x3 &r dest.z = trans.z + source.x * rot.m[0][2] + source.y * rot.m[1][2] + source.z * rot.m[2][2]; } -#endif //__OPC_COMMON_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_COMMON_H diff --git a/engine/src/cmd/collide2/OPC_HybridModel.h b/engine/src/cmd/collide2/OPC_HybridModel.h index 01708fa4bb..23f7451b08 100644 --- a/engine/src/cmd/collide2/OPC_HybridModel.h +++ b/engine/src/cmd/collide2/OPC_HybridModel.h @@ -24,8 +24,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __OPC_HYBRIDMODEL_H__ -#define __OPC_HYBRIDMODEL_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_HYBRIDMODEL_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_HYBRIDMODEL_H //! Leaf descriptor struct LeafTriangles { @@ -121,4 +121,4 @@ class OPCODE_API HybridModel : public BaseModel { void Release(); }; -#endif // __OPC_HYBRIDMODEL_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_HYBRIDMODEL_H diff --git a/engine/src/cmd/collide2/OPC_IceHook.h b/engine/src/cmd/collide2/OPC_IceHook.h index 59cfeafe67..432360c7b8 100644 --- a/engine/src/cmd/collide2/OPC_IceHook.h +++ b/engine/src/cmd/collide2/OPC_IceHook.h @@ -1,3 +1,4 @@ +// NO HEADER GUARD // Should be included by Opcode.h if needed diff --git a/engine/src/cmd/collide2/OPC_LSSAABBOverlap.h b/engine/src/cmd/collide2/OPC_LSSAABBOverlap.h index 4b48f7dd35..1d2a980504 100644 --- a/engine/src/cmd/collide2/OPC_LSSAABBOverlap.h +++ b/engine/src/cmd/collide2/OPC_LSSAABBOverlap.h @@ -1,3 +1,4 @@ +// NO HEADER GUARD // Following code from Magic-Software (http://www.magic-software.com/) // A bit modified for Opcode diff --git a/engine/src/cmd/collide2/OPC_LSSCollider.h b/engine/src/cmd/collide2/OPC_LSSCollider.h index 95f086892c..9f4b4d82ef 100644 --- a/engine/src/cmd/collide2/OPC_LSSCollider.h +++ b/engine/src/cmd/collide2/OPC_LSSCollider.h @@ -24,8 +24,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __OPC_LSSCOLLIDER_H__ -#define __OPC_LSSCOLLIDER_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_OPC_LSS_COLLIDER_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_OPC_LSS_COLLIDER_H struct OPCODE_API LSSCache : VolumeCache { LSSCache() { @@ -110,4 +110,4 @@ class OPCODE_API HybridLSSCollider : public LSSCollider { Container mTouchedBoxes; }; -#endif // __OPC_LSSCOLLIDER_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_OPC_LSS_COLLIDER_H diff --git a/engine/src/cmd/collide2/OPC_LSSTriOverlap.h b/engine/src/cmd/collide2/OPC_LSSTriOverlap.h index 758446df5f..92b8fe53ee 100644 --- a/engine/src/cmd/collide2/OPC_LSSTriOverlap.h +++ b/engine/src/cmd/collide2/OPC_LSSTriOverlap.h @@ -1,5 +1,6 @@ // Following code from Magic-Software (http://www.magic-software.com/) // A bit modified for Opcode +// NO HEADER GUARD static const float gs_fTolerance = 1e-05f; diff --git a/engine/src/cmd/collide2/OPC_MeshInterface.h b/engine/src/cmd/collide2/OPC_MeshInterface.h index 6f3393e8e1..12b5ead380 100644 --- a/engine/src/cmd/collide2/OPC_MeshInterface.h +++ b/engine/src/cmd/collide2/OPC_MeshInterface.h @@ -24,8 +24,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __OPC_MESHINTERFACE_H__ -#define __OPC_MESHINTERFACE_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_MESHINTERFACE_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_MESHINTERFACE_H struct VertexPointers { const Point *Vertex[3]; @@ -200,4 +200,4 @@ class OPCODE_API MeshInterface { uint32_t mNbVerts; //!< Number of vertices in the input model }; -#endif //__OPC_MESHINTERFACE_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_MESHINTERFACE_H diff --git a/engine/src/cmd/collide2/OPC_Model.h b/engine/src/cmd/collide2/OPC_Model.h index a3a67e39dc..aa34b7907b 100644 --- a/engine/src/cmd/collide2/OPC_Model.h +++ b/engine/src/cmd/collide2/OPC_Model.h @@ -24,8 +24,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __OPC_MODEL_H__ -#define __OPC_MODEL_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_MODEL_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_MODEL_H class OPCODE_API Model : public BaseModel { public: @@ -68,4 +68,4 @@ class OPCODE_API Model : public BaseModel { void Release(); }; -#endif //__OPC_MODEL_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_MODEL_H diff --git a/engine/src/cmd/collide2/OPC_OBBCollider.h b/engine/src/cmd/collide2/OPC_OBBCollider.h index 800bfb7838..d962ffd7b9 100644 --- a/engine/src/cmd/collide2/OPC_OBBCollider.h +++ b/engine/src/cmd/collide2/OPC_OBBCollider.h @@ -24,8 +24,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __OPC_OBBCOLLIDER_H__ -#define __OPC_OBBCOLLIDER_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_OPC_OBB_COLLIDER_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_OPC_OBB_COLLIDER_H struct OPCODE_API OBBCache : VolumeCache { OBBCache() : FatCoeff(1.1f) { @@ -155,4 +155,4 @@ class OPCODE_API HybridOBBCollider : public OBBCollider { Container mTouchedBoxes; }; -#endif // __OPC_OBBCOLLIDER_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_OPC_OBB_COLLIDER_H diff --git a/engine/src/cmd/collide2/OPC_OptimizedTree.h b/engine/src/cmd/collide2/OPC_OptimizedTree.h index 707b5aa3bf..fd3337aa1a 100644 --- a/engine/src/cmd/collide2/OPC_OptimizedTree.h +++ b/engine/src/cmd/collide2/OPC_OptimizedTree.h @@ -24,8 +24,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __OPC_OPTIMIZEDTREE_H__ -#define __OPC_OPTIMIZEDTREE_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_OPTIMIZEDTREE_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_OPTIMIZEDTREE_H //! Common interface for a node of an implicit tree #define IMPLEMENT_IMPLICIT_NODE(base_class, volume) \ @@ -218,4 +218,4 @@ IMPLEMENT_COLLISION_TREE(AABBQuantizedNoLeafTree, AABBQuantizedNoLeafNode) Point mExtentsCoeff; }; -#endif // __OPC_OPTIMIZEDTREE_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_OPTIMIZEDTREE_H diff --git a/engine/src/cmd/collide2/OPC_Picking.h b/engine/src/cmd/collide2/OPC_Picking.h index 7edcf681cc..85e1156f19 100644 --- a/engine/src/cmd/collide2/OPC_Picking.h +++ b/engine/src/cmd/collide2/OPC_Picking.h @@ -24,8 +24,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __OPC_PICKING_H__ -#define __OPC_PICKING_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_OPC_PICKING_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_OPC_PICKING_H #ifdef OPC_RAYHIT_CALLBACK @@ -48,4 +48,4 @@ OPCODE_API bool Picking( float min_dist, float max_dist, const Point &view_point, CullModeCallback callback, void *user_data); #endif -#endif //__OPC_PICKING_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_OPC_PICKING_H diff --git a/engine/src/cmd/collide2/OPC_PlanesAABBOverlap.h b/engine/src/cmd/collide2/OPC_PlanesAABBOverlap.h index 18d5dabc92..3ee77ab60c 100644 --- a/engine/src/cmd/collide2/OPC_PlanesAABBOverlap.h +++ b/engine/src/cmd/collide2/OPC_PlanesAABBOverlap.h @@ -19,6 +19,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +// NO HEADER GUARD /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** diff --git a/engine/src/cmd/collide2/OPC_PlanesCollider.h b/engine/src/cmd/collide2/OPC_PlanesCollider.h index 5ec89408b6..4e5f9f66d9 100644 --- a/engine/src/cmd/collide2/OPC_PlanesCollider.h +++ b/engine/src/cmd/collide2/OPC_PlanesCollider.h @@ -24,8 +24,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __OPC_PLANESCOLLIDER_H__ -#define __OPC_PLANESCOLLIDER_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_PLANESCOLLIDER_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_PLANESCOLLIDER_H struct OPCODE_API PlanesCache : VolumeCache { PlanesCache() { @@ -132,4 +132,4 @@ class OPCODE_API HybridPlanesCollider : public PlanesCollider { Container mTouchedBoxes; }; -#endif // __OPC_PLANESCOLLIDER_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_PLANESCOLLIDER_H diff --git a/engine/src/cmd/collide2/OPC_PlanesTriOverlap.h b/engine/src/cmd/collide2/OPC_PlanesTriOverlap.h index 0bec6b9220..5a9318ce91 100644 --- a/engine/src/cmd/collide2/OPC_PlanesTriOverlap.h +++ b/engine/src/cmd/collide2/OPC_PlanesTriOverlap.h @@ -4,6 +4,7 @@ * Updated by Stephen G. Tuggy 2022-01-06 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// NO HEADER GUARD /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** diff --git a/engine/src/cmd/collide2/OPC_RayAABBOverlap.h b/engine/src/cmd/collide2/OPC_RayAABBOverlap.h index 8e9c759f40..2c72254174 100644 --- a/engine/src/cmd/collide2/OPC_RayAABBOverlap.h +++ b/engine/src/cmd/collide2/OPC_RayAABBOverlap.h @@ -3,6 +3,7 @@ // // The point of intersection is not computed anymore. The distance to impact is not needed anymore // since we now have two different queries for segments or rays. +// NO HEADER GUARD /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** diff --git a/engine/src/cmd/collide2/OPC_RayCollider.h b/engine/src/cmd/collide2/OPC_RayCollider.h index 69c9d93cde..b9734d778c 100644 --- a/engine/src/cmd/collide2/OPC_RayCollider.h +++ b/engine/src/cmd/collide2/OPC_RayCollider.h @@ -24,8 +24,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __OPC_RAYCOLLIDER_H__ -#define __OPC_RAYCOLLIDER_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_OPC_RAY_COLLIDER_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_OPC_RAY_COLLIDER_H class OPCODE_API CollisionFace { public: @@ -257,4 +257,4 @@ class OPCODE_API RayCollider : public Collider { bool InitQuery(const Ray &world_ray, const Matrix4x4 *world = nullptr, uint32_t *face_id = nullptr); }; -#endif // __OPC_RAYCOLLIDER_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_OPC_RAY_COLLIDER_H diff --git a/engine/src/cmd/collide2/OPC_RayTriOverlap.h b/engine/src/cmd/collide2/OPC_RayTriOverlap.h index 576b8aaf14..912632705a 100644 --- a/engine/src/cmd/collide2/OPC_RayTriOverlap.h +++ b/engine/src/cmd/collide2/OPC_RayTriOverlap.h @@ -1,3 +1,4 @@ +// NO HEADER GUARD #define LOCAL_EPSILON 0.000001f /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/OPC_Settings.h b/engine/src/cmd/collide2/OPC_Settings.h index 748b9e8d4c..557c35b260 100644 --- a/engine/src/cmd/collide2/OPC_Settings.h +++ b/engine/src/cmd/collide2/OPC_Settings.h @@ -19,8 +19,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __OPC_SETTINGS_H__ -#define __OPC_SETTINGS_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_SETTINGS_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_SETTINGS_H //! Use CPU comparisons (comment that line to use standard FPU compares) #if defined(CS_PROCESSOR_X86) @@ -53,4 +53,4 @@ // NB: no compilation flag to enable/disable stats since they're actually needed in the box/box overlap test -#endif //__OPC_SETTINGS_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_SETTINGS_H diff --git a/engine/src/cmd/collide2/OPC_SphereAABBOverlap.h b/engine/src/cmd/collide2/OPC_SphereAABBOverlap.h index c88e8721ae..6d49cf8bbd 100644 --- a/engine/src/cmd/collide2/OPC_SphereAABBOverlap.h +++ b/engine/src/cmd/collide2/OPC_SphereAABBOverlap.h @@ -4,6 +4,7 @@ * Updated by Stephen G. Tuggy 2022-01-06 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// NO HEADER GUARD /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** diff --git a/engine/src/cmd/collide2/OPC_SphereCollider.h b/engine/src/cmd/collide2/OPC_SphereCollider.h index 4b6b5683ad..1ecd71215b 100644 --- a/engine/src/cmd/collide2/OPC_SphereCollider.h +++ b/engine/src/cmd/collide2/OPC_SphereCollider.h @@ -24,8 +24,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __OPC_SPHERECOLLIDER_H__ -#define __OPC_SPHERECOLLIDER_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_SPHERE_COLLIDER_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_SPHERE_COLLIDER_H struct OPCODE_API SphereCache : VolumeCache { SphereCache() : Center(0.0f, 0.0f, 0.0f), FatRadius2(0.0f), FatCoeff(1.1f) { @@ -111,4 +111,4 @@ class OPCODE_API HybridSphereCollider : public SphereCollider { Container mTouchedBoxes; }; -#endif // __OPC_SPHERECOLLIDER_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_SPHERE_COLLIDER_H diff --git a/engine/src/cmd/collide2/OPC_SphereTriOverlap.h b/engine/src/cmd/collide2/OPC_SphereTriOverlap.h index 16f7d3e9e6..f4a4609e64 100644 --- a/engine/src/cmd/collide2/OPC_SphereTriOverlap.h +++ b/engine/src/cmd/collide2/OPC_SphereTriOverlap.h @@ -1,3 +1,4 @@ +// NO HEADER GUARD // This is collision detection. If you do another distance test for collision *response*, // if might be useful to simply *skip* the test below completely, and report a collision. diff --git a/engine/src/cmd/collide2/OPC_SweepAndPrune.h b/engine/src/cmd/collide2/OPC_SweepAndPrune.h index 199e51bfff..c2443cd245 100644 --- a/engine/src/cmd/collide2/OPC_SweepAndPrune.h +++ b/engine/src/cmd/collide2/OPC_SweepAndPrune.h @@ -24,8 +24,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __OPC_SWEEPANDPRUNE_H__ -#define __OPC_SWEEPANDPRUNE_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_OPC_SWEEP_AND_PRUNE_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_OPC_SWEEP_AND_PRUNE_H /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** @@ -88,4 +88,4 @@ class OPCODE_API SweepAndPrune { bool CheckListsIntegrity(); }; -#endif //__OPC_SWEEPANDPRUNE_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_OPC_SWEEP_AND_PRUNE_H diff --git a/engine/src/cmd/collide2/OPC_TreeBuilders.h b/engine/src/cmd/collide2/OPC_TreeBuilders.h index 00f5cf9023..d2cd31430f 100644 --- a/engine/src/cmd/collide2/OPC_TreeBuilders.h +++ b/engine/src/cmd/collide2/OPC_TreeBuilders.h @@ -46,8 +46,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __OPC_TREEBUILDERS_H__ -#define __OPC_TREEBUILDERS_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_OPC_TREE_BUILDERS_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_OPC_TREE_BUILDERS_H //! Tree splitting rules enum SplittingRules { @@ -238,4 +238,4 @@ class OPCODE_API AABBTreeOfTrianglesBuilder : public AABBTreeBuilder { const MeshInterface *mIMesh; //!< Shortcut to an app-controlled mesh interface }; -#endif // __OPC_TREEBUILDERS_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_ICE_OPC_TREE_BUILDERS_H diff --git a/engine/src/cmd/collide2/OPC_TreeCollider.h b/engine/src/cmd/collide2/OPC_TreeCollider.h index a1953f848d..8e68c62d0f 100644 --- a/engine/src/cmd/collide2/OPC_TreeCollider.h +++ b/engine/src/cmd/collide2/OPC_TreeCollider.h @@ -24,8 +24,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __OPC_TREECOLLIDER_H__ -#define __OPC_TREECOLLIDER_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_TREECOLLIDER_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_TREECOLLIDER_H //! This structure holds cached information used by the algorithm. //! Two model pointers and two colliding primitives are cached. Model pointers are assigned @@ -284,4 +284,4 @@ class OPCODE_API AABBTreeCollider : public Collider { } }; -#endif // __OPC_TREECOLLIDER_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_TREECOLLIDER_H diff --git a/engine/src/cmd/collide2/OPC_TriBoxOverlap.h b/engine/src/cmd/collide2/OPC_TriBoxOverlap.h index bf08b2f328..c23060706e 100644 --- a/engine/src/cmd/collide2/OPC_TriBoxOverlap.h +++ b/engine/src/cmd/collide2/OPC_TriBoxOverlap.h @@ -4,6 +4,7 @@ * Updated by Stephen G. Tuggy 2022-01-06 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// NO HEADER GUARD //! This macro quickly finds the min & max values among 3 variables #define FINDMINMAX(x0, x1, x2, min, max) \ diff --git a/engine/src/cmd/collide2/OPC_TriTriOverlap.h b/engine/src/cmd/collide2/OPC_TriTriOverlap.h index 80f0d975f9..0133d81aa6 100644 --- a/engine/src/cmd/collide2/OPC_TriTriOverlap.h +++ b/engine/src/cmd/collide2/OPC_TriTriOverlap.h @@ -1,4 +1,3 @@ - /* * Copyright (C) 2001-2022 Pierre Terdiman, Daniel Horn, pyramid3d, * Stephen G. Tuggy, and other Vega Strike contributors. @@ -20,6 +19,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +// NO HEADER GUARD //! if OPC_TRITRI_EPSILON_TEST is true then we do a check (if |dv|<EPSILON then dv=0.0;) else no check is done (which is less robust, but faster) #define LOCAL_EPSILON 0.000001f diff --git a/engine/src/cmd/collide2/OPC_VolumeCollider.h b/engine/src/cmd/collide2/OPC_VolumeCollider.h index e73280a78c..a97d93e458 100644 --- a/engine/src/cmd/collide2/OPC_VolumeCollider.h +++ b/engine/src/cmd/collide2/OPC_VolumeCollider.h @@ -24,8 +24,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __OPC_VOLUMECOLLIDER_H__ -#define __OPC_VOLUMECOLLIDER_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_VOLUMECOLLIDER_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_VOLUMECOLLIDER_H struct OPCODE_API VolumeCache { VolumeCache() : Model(nullptr) { @@ -146,4 +146,4 @@ class OPCODE_API VolumeCollider : public Collider { } }; -#endif // __OPC_VOLUMECOLLIDER_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPC_VOLUMECOLLIDER_H diff --git a/engine/src/cmd/collide2/Opcode.h b/engine/src/cmd/collide2/Opcode.h index 2c86ebb4e6..3a3f73cb67 100644 --- a/engine/src/cmd/collide2/Opcode.h +++ b/engine/src/cmd/collide2/Opcode.h @@ -36,8 +36,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Include Guard -#ifndef __OPCODE_H__ -#define __OPCODE_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPCODE_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPCODE_H /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Preprocessor @@ -187,4 +187,4 @@ namespace Opcode { } -#endif // __OPCODE_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPCODE_H diff --git a/engine/src/cmd/collide2/Stdafx.h b/engine/src/cmd/collide2/Stdafx.h index ca3a9dc858..a51008df0c 100644 --- a/engine/src/cmd/collide2/Stdafx.h +++ b/engine/src/cmd/collide2/Stdafx.h @@ -27,8 +27,8 @@ */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#ifndef _STDAFX_H_ -#define _STDAFX_H_ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_STDAFX_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_STDAFX_H // Stephen G. Tuggy getting rid of this hack entirely // chuck starchaser shutting up the warnings about violations of strict aliasing... @@ -48,5 +48,4 @@ #include "Opcode.h" #include "vs_vector.h" -#endif // _STDAFX_H_ - +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_STDAFX_H diff --git a/engine/src/cmd/collide2/basecollider.h b/engine/src/cmd/collide2/basecollider.h index 8dcf7ef87e..67930415f4 100644 --- a/engine/src/cmd/collide2/basecollider.h +++ b/engine/src/cmd/collide2/basecollider.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _BASECOLLIDER_H__ -#define _BASECOLLIDER_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_BASECOLLIDER_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_BASECOLLIDER_H #define CS_MESH_COLLIDER 0 #define CS_TERRAFORMER_COLLIDER 1 @@ -51,5 +49,4 @@ struct csCollisionPair { Opcode::Point a2, b2, c2; // Second triangle }; -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_BASECOLLIDER_H diff --git a/engine/src/cmd/collide2/csgeom2/opbox.h b/engine/src/cmd/collide2/csgeom2/opbox.h index 8a32ea976f..71a5b97120 100644 --- a/engine/src/cmd/collide2/csgeom2/opbox.h +++ b/engine/src/cmd/collide2/csgeom2/opbox.h @@ -17,10 +17,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - - -#ifndef __CS_BOX_H__ -#define __CS_BOX_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_CS_BOX_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_CS_BOX_H #include "opvector3.h" @@ -526,4 +524,4 @@ class csBox3 { friend bool operator<(const csVector3 &point, const csBox3 &box); }; -#endif // __CS_BOX_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_CS_BOX_H diff --git a/engine/src/cmd/collide2/csgeom2/opmath.h b/engine/src/cmd/collide2/csgeom2/opmath.h index 8891f613d5..e41abd359c 100644 --- a/engine/src/cmd/collide2/csgeom2/opmath.h +++ b/engine/src/cmd/collide2/csgeom2/opmath.h @@ -16,10 +16,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - - -#ifndef __CS_MATH_H__ -#define __CS_MATH_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_CS_MATH_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_CS_MATH_H #define HAVE_ISNORMAL 1 @@ -215,4 +213,4 @@ CS_FORCEINLINE bool csNormal(double d) { /** @} */ -#endif //__CS_MATH_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_CS_MATH_H diff --git a/engine/src/cmd/collide2/csgeom2/opmatrix3.h b/engine/src/cmd/collide2/csgeom2/opmatrix3.h index ea77146103..101e56827a 100644 --- a/engine/src/cmd/collide2/csgeom2/opmatrix3.h +++ b/engine/src/cmd/collide2/csgeom2/opmatrix3.h @@ -17,10 +17,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - - -#ifndef __CS_MATRIX3_H__ -#define __CS_MATRIX3_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_CS_MATRIX3_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_CS_MATRIX3_H #include "opvector3.h" @@ -255,4 +253,4 @@ class csZScaleMatrix3 : public csMatrix3 { } }; -#endif // __CS_MATRIX3_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_CS_MATRIX3_H diff --git a/engine/src/cmd/collide2/csgeom2/optransfrm.h b/engine/src/cmd/collide2/csgeom2/optransfrm.h index 0bb903ecf8..17380d2882 100644 --- a/engine/src/cmd/collide2/csgeom2/optransfrm.h +++ b/engine/src/cmd/collide2/csgeom2/optransfrm.h @@ -17,10 +17,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - - -#ifndef __CS_TRANSFORM_H__ -#define __CS_TRANSFORM_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_CS_TRANSFORM_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_CS_TRANSFORM_H #include "opmatrix3.h" @@ -438,4 +436,4 @@ class csOrthoTransform : public csReversibleTransform { } }; -#endif // __CS_TRANSFORM_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_CS_TRANSFORM_H diff --git a/engine/src/cmd/collide2/csgeom2/opvector3.h b/engine/src/cmd/collide2/csgeom2/opvector3.h index ad911fab19..6c86297c27 100644 --- a/engine/src/cmd/collide2/csgeom2/opvector3.h +++ b/engine/src/cmd/collide2/csgeom2/opvector3.h @@ -19,8 +19,8 @@ */ -#ifndef __CS_VECTOR3_H__ -#define __CS_VECTOR3_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_CS_VECTOR3_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_CS_VECTOR3_H #include "cmd/collide2/Stdafx.h" #include "cmd/collide2/opcodesysdef.h" @@ -270,4 +270,4 @@ class csVector3 { } }; -#endif // __CS_VECTOR3_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_CS_VECTOR3_H diff --git a/engine/src/cmd/collide2/opcodealgorithms.h b/engine/src/cmd/collide2/opcodealgorithms.h index e7f827b03e..9e033a7d61 100644 --- a/engine/src/cmd/collide2/opcodealgorithms.h +++ b/engine/src/cmd/collide2/opcodealgorithms.h @@ -16,9 +16,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - -#ifndef __CSUTIL_ALGORITHMS_H__ -#define __CSUTIL_ALGORITHMS_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_CSUTIL_ALGORITHMS_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_CSUTIL_ALGORITHMS_H /**\file * General Algorithms @@ -113,4 +112,4 @@ Func; } -#endif // __CSUTIL_ALGORITHMS_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_CSUTIL_ALGORITHMS_H diff --git a/engine/src/cmd/collide2/opcodeextern.h b/engine/src/cmd/collide2/opcodeextern.h index 0ddf17fb0f..d75f36030a 100644 --- a/engine/src/cmd/collide2/opcodeextern.h +++ b/engine/src/cmd/collide2/opcodeextern.h @@ -17,9 +17,9 @@ Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef __CS_OPCODEEXTERN_H__ -#define __CS_OPCODEEXTERN_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_CS_OPCODEEXTERN_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_CS_OPCODEEXTERN_H #define CS_CRYSTALSPACE_EXPORT -#endif // __OPCODE_EXTERN_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_CS_OPCODEEXTERN_H diff --git a/engine/src/cmd/collide2/opcodegarray.h b/engine/src/cmd/collide2/opcodegarray.h index 9cd5dd8d02..fd5d99a6b5 100644 --- a/engine/src/cmd/collide2/opcodegarray.h +++ b/engine/src/cmd/collide2/opcodegarray.h @@ -18,9 +18,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - -#ifndef __CS_GARRAY_H__ -#define __CS_GARRAY_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_CS_GARRAY_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_CS_GARRAY_H // Common macro for declarations below #define CS_TYPEDEF_GROWING_ARRAY_EXT(Name, Type, ExtraConstructor, Extra) \ @@ -189,4 +188,4 @@ #define CS_DECLARE_GROWING_ARRAY_REF(Name, Type) \ CS_TYPEDEF_GROWING_ARRAY_REF(__##Name,Type) Name -#endif // __CS_GARRAY_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_CS_GARRAY_H diff --git a/engine/src/cmd/collide2/opcodeqint.h b/engine/src/cmd/collide2/opcodeqint.h index 622b3e47de..312e7c2ab7 100644 --- a/engine/src/cmd/collide2/opcodeqint.h +++ b/engine/src/cmd/collide2/opcodeqint.h @@ -15,9 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - -#ifndef __QINT_H__ -#define __QINT_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_QINT_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_QINT_H #if defined (CS_IEEE_DOUBLE_FORMAT) @@ -206,4 +205,4 @@ inline long QInt24 (float inval) #endif /* CS_IEEE_DOUBLE_FORMAT */ -#endif // __QINT_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_QINT_H diff --git a/engine/src/cmd/collide2/opcodeqsqrt.h b/engine/src/cmd/collide2/opcodeqsqrt.h index 99e577f9ce..05404133b4 100644 --- a/engine/src/cmd/collide2/opcodeqsqrt.h +++ b/engine/src/cmd/collide2/opcodeqsqrt.h @@ -25,8 +25,8 @@ // is the problem. //#define CS_NO_QSQRT -#ifndef __QSQRT_H__ -#define __QSQRT_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_QSQRT_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_QSQRT_H #if (!defined (CS_NO_QSQRT)) && defined (CS_PROCESSOR_X86) && defined (CS_COMPILER_GCC) #include "Stdafx.h" @@ -175,4 +175,4 @@ static inline float qisqrt(float x) #endif -#endif // __QSQRT_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_QSQRT_H diff --git a/engine/src/cmd/collide2/opcodesysdef.h b/engine/src/cmd/collide2/opcodesysdef.h index 75dc83c9fb..3f41df85fe 100644 --- a/engine/src/cmd/collide2/opcodesysdef.h +++ b/engine/src/cmd/collide2/opcodesysdef.h @@ -20,10 +20,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef CS_COMPAT_H_ -#define CS_COMPAT_H_ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2CS_COMPAT_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2CS_COMPAT_H //#define OPC_USE_CALLBACKS 1 @@ -65,4 +63,4 @@ struct iBase { #define CS_ASSERT assert #include "opcodetypes.h" -#endif +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2CS_COMPAT_H diff --git a/engine/src/cmd/collide2/opcodetypes.h b/engine/src/cmd/collide2/opcodetypes.h index faba7ec1a5..a2a20b4324 100644 --- a/engine/src/cmd/collide2/opcodetypes.h +++ b/engine/src/cmd/collide2/opcodetypes.h @@ -18,9 +18,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - -#ifndef __CS_CSTYPES_H__ -#define __CS_CSTYPES_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_CS_CSTYPES_H +#define VEGA_STRIKE_ENGINE_CMD_COLLSION2_CS_CSTYPES_H // config.h is the VS ./configure determined header. #include <float.h> @@ -169,4 +168,4 @@ typedef unsigned int opc_uint; /** @} */ -#endif // __CS_CSTYPES_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_COLLSION2_CS_CSTYPES_H diff --git a/engine/src/cmd/collide2/segmentcell.h b/engine/src/cmd/collide2/segmentcell.h index 8ba5b1de9c..42c2d0c126 100644 --- a/engine/src/cmd/collide2/segmentcell.h +++ b/engine/src/cmd/collide2/segmentcell.h @@ -16,7 +16,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - +// NO HEADER GUARD class csTerrainSegmentCellCollider { private: diff --git a/engine/src/cmd/collide_map.h b/engine/src/cmd/collide_map.h index f21f21d973..4355f9f4ca 100644 --- a/engine/src/cmd/collide_map.h +++ b/engine/src/cmd/collide_map.h @@ -23,10 +23,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLIDE_MAP_H +#define VEGA_STRIKE_ENGINE_CMD_COLLIDE_MAP_H - -#ifndef _COLLIDE_MAP_H_ -#define _COLLIDE_MAP_H_ #include "key_mutable_set.h" #include "vegastrike.h" #include "gfx/vec.h" @@ -236,5 +235,5 @@ inline void set_null(CollideMap::iterator &it) { } #endif -#endif +#endif //VEGA_STRIKE_ENGINE_CMD_COLLIDE_MAP_H diff --git a/engine/src/cmd/collision.h b/engine/src/cmd/collision.h index 09bafb277d..82d5826c56 100644 --- a/engine/src/cmd/collision.h +++ b/engine/src/cmd/collision.h @@ -22,10 +22,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef COLLISION_H -#define COLLISION_H +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLISION_H +#define VEGA_STRIKE_ENGINE_CMD_COLLISION_H #include "gfx/vec.h" #include "unit_generic.h" @@ -85,4 +83,4 @@ class Collision { }; -#endif // COLLISION_H +#endif //VEGA_STRIKE_ENGINE_CMD_COLLISION_H diff --git a/engine/src/cmd/computer.h b/engine/src/cmd/computer.h index 68dfd8c536..ac17b88b19 100644 --- a/engine/src/cmd/computer.h +++ b/engine/src/cmd/computer.h @@ -23,9 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef COMPUTER_H -#define COMPUTER_H +#ifndef VEGA_STRIKE_ENGINE_CMD_COMPUTER_H +#define VEGA_STRIKE_ENGINE_CMD_COMPUTER_H #include "container.h" #include "config.h" @@ -131,4 +130,4 @@ class Computer { Computer(); }; -#endif // COMPUTER_H +#endif //VEGA_STRIKE_ENGINE_CMD_COMPUTER_H diff --git a/engine/src/cmd/cont_terrain.h b/engine/src/cmd/cont_terrain.h index 4c3274133f..bca046e434 100644 --- a/engine/src/cmd/cont_terrain.h +++ b/engine/src/cmd/cont_terrain.h @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +// NO HEADER GUARD #include "cmd/collide2/Stdafx.h" #include "cmd/collide2/CSopcodecollider.h" diff --git a/engine/src/cmd/container.h b/engine/src/cmd/container.h index d1c3175228..60600487a9 100644 --- a/engine/src/cmd/container.h +++ b/engine/src/cmd/container.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _UNITCONTAINER_H_ -#define _UNITCONTAINER_H_ +#ifndef VEGA_STRIKE_ENGINE_CMD_UNITCONTAINER_H +#define VEGA_STRIKE_ENGINE_CMD_UNITCONTAINER_H #include "debug_vs.h" @@ -75,5 +73,4 @@ class UnitContainer { } }; -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_UNITCONTAINER_H diff --git a/engine/src/cmd/csv.h b/engine/src/cmd/csv.h index 475f1bdb7f..f55fe8168e 100644 --- a/engine/src/cmd/csv.h +++ b/engine/src/cmd/csv.h @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +// NO HEADER GUARD #include <string> #include <vector> diff --git a/engine/src/cmd/damageable.h b/engine/src/cmd/damageable.h index cbf67bd4c3..6356a95476 100644 --- a/engine/src/cmd/damageable.h +++ b/engine/src/cmd/damageable.h @@ -22,10 +22,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef DAMAGEABLE_H -#define DAMAGEABLE_H +#ifndef VEGA_STRIKE_ENGINE_CMD_DAMAGEABLE_H +#define VEGA_STRIKE_ENGINE_CMD_DAMAGEABLE_H #include "damageable_object.h" #include "gfx/vec.h" @@ -162,4 +160,4 @@ class Damageable : public DamageableObject { bool flickerDamage(); }; -#endif // DAMAGEABLE_H +#endif //VEGA_STRIKE_ENGINE_CMD_DAMAGEABLE_H diff --git a/engine/src/cmd/drawable.h b/engine/src/cmd/drawable.h index 34133e0c2b..7ce786bd5f 100644 --- a/engine/src/cmd/drawable.h +++ b/engine/src/cmd/drawable.h @@ -22,10 +22,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef DRAWABLE_H -#define DRAWABLE_H +#ifndef VEGA_STRIKE_ENGINE_CMD_DRAWABLE_H +#define VEGA_STRIKE_ENGINE_CMD_DRAWABLE_H #include "gfx/quaternion.h" #include "gfx/halo_system.h" @@ -161,4 +159,4 @@ class Drawable { Matrix *GetCumulativeTransformationMatrix(Unit *unit, const Matrix &parentMatrix, Matrix invview); -#endif // DRAWABLE_H +#endif //VEGA_STRIKE_ENGINE_CMD_DRAWABLE_H diff --git a/engine/src/cmd/energetic.h b/engine/src/cmd/energetic.h index 15f7ed9690..dbf6d1e198 100644 --- a/engine/src/cmd/energetic.h +++ b/engine/src/cmd/energetic.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef ENERGETIC_H -#define ENERGETIC_H +#ifndef VEGA_STRIKE_ENGINE_CMD_ENERGETIC_H +#define VEGA_STRIKE_ENGINE_CMD_ENERGETIC_H #include "resource/resource.h" @@ -109,4 +107,4 @@ class Energetic { //-1 means it is off. -2 means it doesn't exist. otherwise it's engaged to destination (positive number) }; -#endif // ENERGETIC_H +#endif //VEGA_STRIKE_ENGINE_CMD_ENERGETIC_H diff --git a/engine/src/cmd/engineVersion.h b/engine/src/cmd/engineVersion.h index a8fe594432..dd3ff3117b 100644 --- a/engine/src/cmd/engineVersion.h +++ b/engine/src/cmd/engineVersion.h @@ -21,10 +21,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef VS_ENGINE_VERSION_H__ -#define VS_ENGINE_VERSION_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_VERSION_H +#define VEGA_STRIKE_ENGINE_CMD_VERSION_H #include <string> #include <stdint.h> @@ -56,4 +54,4 @@ class EngineVersionData { }; } -#endif //VS_ENGINE_VERSION_H__ +#endif //VEGA_STRIKE_ENGINE_CMD_VERSION_H diff --git a/engine/src/cmd/enhancement.h b/engine/src/cmd/enhancement.h index b11110b59f..5e70bcff43 100644 --- a/engine/src/cmd/enhancement.h +++ b/engine/src/cmd/enhancement.h @@ -23,10 +23,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_CMD_ENHANCER_H +#define VEGA_STRIKE_ENGINE_CMD_ENHANCER_H - -#ifndef _ENHANCER_H_ -#define _ENHANCER_H_ #include "savegame.h" #include "universe.h" #include "unit_generic.h" @@ -59,5 +58,4 @@ class Enhancement : public Unit { Enhancement &operator=(const Enhancement &); }; -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_ENHANCER_H diff --git a/engine/src/cmd/faction_factory.h b/engine/src/cmd/faction_factory.h index c4f38ff30d..70b225a34c 100644 --- a/engine/src/cmd/faction_factory.h +++ b/engine/src/cmd/faction_factory.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef FACTIONFACTORY_H -#define FACTIONFACTORY_H +#ifndef VEGA_STRIKE_ENGINE_CMD_FACTION_FACTORY_H +#define VEGA_STRIKE_ENGINE_CMD_FACTION_FACTORY_H #include <string> #include <boost/property_tree/ptree.hpp> @@ -34,4 +33,4 @@ class FactionFactory { void parse(boost::property_tree::ptree tree); }; -#endif // FACTIONFACTORY_H +#endif //VEGA_STRIKE_ENGINE_CMD_FACTION_FACTORY_H diff --git a/engine/src/cmd/fg_util.h b/engine/src/cmd/fg_util.h index 7048e7017c..048b607ec0 100644 --- a/engine/src/cmd/fg_util.h +++ b/engine/src/cmd/fg_util.h @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +// NO HEADER GUARD namespace fg_util { std::string MakeFactionKey(int faction); diff --git a/engine/src/cmd/images.h b/engine/src/cmd/images.h index c83c374d81..8fd5261ade 100644 --- a/engine/src/cmd/images.h +++ b/engine/src/cmd/images.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _IMAGES_H -#define _IMAGES_H +#ifndef VEGA_STRIKE_ENGINE_CMD_IMAGES_H +#define VEGA_STRIKE_ENGINE_CMD_IMAGES_H #include <string> #include <vector> @@ -311,5 +309,4 @@ struct unorigdest { } }; -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_IMAGES_H diff --git a/engine/src/cmd/intelligent.h b/engine/src/cmd/intelligent.h index f8de00f018..6f6d3d55d8 100644 --- a/engine/src/cmd/intelligent.h +++ b/engine/src/cmd/intelligent.h @@ -21,9 +21,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef INTELLIGENT_H -#define INTELLIGENT_H +#ifndef VEGA_STRIKE_ENGINE_CMD_INTELLIGENT_H +#define VEGA_STRIKE_ENGINE_CMD_INTELLIGENT_H #include "gfx/vec.h" @@ -94,4 +93,4 @@ class Intelligent { float getRelation(const Unit *other) const; }; -#endif // INTELLIGENT_H +#endif //VEGA_STRIKE_ENGINE_CMD_INTELLIGENT_H diff --git a/engine/src/cmd/json.h b/engine/src/cmd/json.h index 349ead5a6c..d4bb2648ac 100644 --- a/engine/src/cmd/json.h +++ b/engine/src/cmd/json.h @@ -1,5 +1,5 @@ -#ifndef JSON_H -#define JSON_H +#ifndef VEGA_STRIKE_ENGINE_CMD_JSON_H +#define VEGA_STRIKE_ENGINE_CMD_JSON_H /*! \file json.h * \brief Simpleson header file @@ -847,4 +847,4 @@ namespace json }; } -#endif // !JSON_H +#endif //VEGA_STRIKE_ENGINE_CMD_JSON_H diff --git a/engine/src/cmd/jump_capable.h b/engine/src/cmd/jump_capable.h index 00a8511466..8ce032b2d5 100644 --- a/engine/src/cmd/jump_capable.h +++ b/engine/src/cmd/jump_capable.h @@ -21,10 +21,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef JUMPCAPABLE_H -#define JUMPCAPABLE_H +#ifndef VEGA_STRIKE_ENGINE_CMD_JUMP_CAPABLE_H +#define VEGA_STRIKE_ENGINE_CMD_JUMP_CAPABLE_H #include "star_system.h" #include "energetic.h" @@ -62,4 +60,4 @@ class JumpCapable { bool DoSightAndSound); }; -#endif // JUMPCAPABLE_H +#endif //VEGA_STRIKE_ENGINE_CMD_JUMP_CAPABLE_H diff --git a/engine/src/cmd/key_mutable_set.h b/engine/src/cmd/key_mutable_set.h index 0058a05459..d9f432ce8c 100644 --- a/engine/src/cmd/key_mutable_set.h +++ b/engine/src/cmd/key_mutable_set.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _KEY_MUTABLE_SET_H_ -#define _KEY_MUTABLE_SET_H_ +#ifndef VEGA_STRIKE_ENGINE_CMD_KEY_MUTABLE_SET_H +#define VEGA_STRIKE_ENGINE_CMD_KEY_MUTABLE_SET_H #include <set> #include <assert.h> @@ -230,5 +228,4 @@ class ListMutableSet : public std::list<T> { } }; -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_KEY_MUTABLE_SET_H diff --git a/engine/src/cmd/missile.h b/engine/src/cmd/missile.h index 351b5a9f6e..ec51e1cd0e 100644 --- a/engine/src/cmd/missile.h +++ b/engine/src/cmd/missile.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef MISSILE_H_ -#define MISSILE_H_ +#ifndef VEGA_STRIKE_ENGINE_CMD_MISSILE_H +#define VEGA_STRIKE_ENGINE_CMD_MISSILE_H #include "unit_util.h" #include "unit_generic.h" @@ -108,5 +106,4 @@ class Missile : public Unit { Missile &operator=(const Missile &); }; -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_MISSILE_H diff --git a/engine/src/cmd/mount.h b/engine/src/cmd/mount.h index aee4484d40..dc423e473a 100644 --- a/engine/src/cmd/mount.h +++ b/engine/src/cmd/mount.h @@ -22,10 +22,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef MOUNT_H -#define MOUNT_H +#ifndef VEGA_STRIKE_ENGINE_CMD_SCRIPT_MOUNT_H +#define VEGA_STRIKE_ENGINE_CMD_SCRIPT_MOUNT_H #include "collide_map.h" #include "gfx/quaternion.h" @@ -147,4 +145,4 @@ class Mount { bool perform_upgrade); }; -#endif // MOUNT_H +#endif //VEGA_STRIKE_ENGINE_CMD_SCRIPT_MOUNT_H diff --git a/engine/src/cmd/mount_size.h b/engine/src/cmd/mount_size.h index 0fb9a5c560..83072ce303 100644 --- a/engine/src/cmd/mount_size.h +++ b/engine/src/cmd/mount_size.h @@ -18,10 +18,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef MOUNT_SIZE_H -#define MOUNT_SIZE_H +#ifndef VEGA_STRIKE_ENGINE_CMD_MOUNT_SIZE_H +#define VEGA_STRIKE_ENGINE_CMD_MOUNT_SIZE_H #include <string> @@ -75,4 +73,4 @@ class MountSize { MountSize(); }; -#endif // MOUNT_SIZE_H +#endif //VEGA_STRIKE_ENGINE_CMD_MOUNT_SIZE_H diff --git a/engine/src/cmd/movable.h b/engine/src/cmd/movable.h index 681bbe4f79..7d6c69d2c4 100644 --- a/engine/src/cmd/movable.h +++ b/engine/src/cmd/movable.h @@ -21,10 +21,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef MOVABLE_H -#define MOVABLE_H +#ifndef VEGA_STRIKE_ENGINE_CMD_MOVABLE_H +#define VEGA_STRIKE_ENGINE_CMD_MOVABLE_H #include "gfx/vec.h" #include "vs_limits.h" @@ -249,4 +247,4 @@ class Movable { Unit *superunit) = 0; }; -#endif // MOVABLE_H +#endif //VEGA_STRIKE_ENGINE_CMD_MOVABLE_H diff --git a/engine/src/cmd/music.h b/engine/src/cmd/music.h index 0ef2df867c..b22adebe6e 100644 --- a/engine/src/cmd/music.h +++ b/engine/src/cmd/music.h @@ -23,10 +23,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_CMD_MUSIC_H +#define VEGA_STRIKE_ENGINE_CMD_MUSIC_H - -#ifndef _MUSIC_H_ -#define _MUSIC_H_ #include "container.h" #include <vector> #include <string> @@ -180,5 +179,4 @@ class Music { extern Music *muzak; extern int muzak_count; -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_MUSIC_H diff --git a/engine/src/cmd/nebula.h b/engine/src/cmd/nebula.h index 52c0d57c19..b6e1534e19 100644 --- a/engine/src/cmd/nebula.h +++ b/engine/src/cmd/nebula.h @@ -19,10 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _NEBULA_H_ -#define _NEBULA_H_ +#ifndef VEGA_STRIKE_ENGINE_CMD_NEBULA_H +#define VEGA_STRIKE_ENGINE_CMD_NEBULA_H #include "unit_generic.h" @@ -129,5 +127,4 @@ const XMLSupport::EnumMap element_map(element_names, MAXENAMES); const XMLSupport::EnumMap attribute_map(attribute_names, MAXANAMES); } -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_NEBULA_H diff --git a/engine/src/cmd/oldcollection.h b/engine/src/cmd/oldcollection.h index 863640de44..d2af64abf9 100644 --- a/engine/src/cmd/oldcollection.h +++ b/engine/src/cmd/oldcollection.h @@ -23,14 +23,13 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_CMD_OLD_COLLECTION_H +#define VEGA_STRIKE_ENGINE_CMD_OLD_COLLECTION_H /* unitCollection.h * *****/ -#ifndef _OLDCOLLECTION_H_ -#define _OLDCOLLECTION_H_ #include <stdlib.h> class Unit; @@ -406,5 +405,4 @@ typedef UnitCollection::ConstIterator un_kiter; typedef UnitCollection::ConstFastIterator un_fkiter; typedef UnitCollection::FastIterator un_fiter; -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_OLD_COLLECTION_H diff --git a/engine/src/cmd/pilot.h b/engine/src/cmd/pilot.h index 2603b24dbb..c2ebd2e852 100644 --- a/engine/src/cmd/pilot.h +++ b/engine/src/cmd/pilot.h @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +// NO HEADER GUARD #include "gnuhash.h" #include <vector> diff --git a/engine/src/cmd/planet.h b/engine/src/cmd/planet.h index 029ec3fd46..d6f5e943b4 100644 --- a/engine/src/cmd/planet.h +++ b/engine/src/cmd/planet.h @@ -19,14 +19,13 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_CMD_PLANET_H +#define VEGA_STRIKE_ENGINE_CMD_PLANET_H /* planet.h * ok * * Unit type that is a gravity source, and follows a set orbit pattern */ -#ifndef _PLANET_H_ -#define _PLANET_H_ #include <stdio.h> #include "unit_generic.h" @@ -291,5 +290,4 @@ class Planet : public Unit { friend bool operator==(const Planet &lhs, const Planet &rhs); }; -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_PLANET_H diff --git a/engine/src/cmd/planetary_orbit.h b/engine/src/cmd/planetary_orbit.h index 2be513804a..17816c6992 100644 --- a/engine/src/cmd/planetary_orbit.h +++ b/engine/src/cmd/planetary_orbit.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef PLANETARY_ORBIT_H -#define PLANETARY_ORBIT_H +#ifndef VEGA_STRIKE_ENGINE_CMD_PLANETARY_ORBIT_H +#define VEGA_STRIKE_ENGINE_CMD_PLANETARY_ORBIT_H #include "gfx/vec.h" #include "star_system.h" @@ -63,4 +61,4 @@ class PlanetaryOrbit : public Order { void Execute(); }; -#endif // PLANETARY_ORBIT_H +#endif //VEGA_STRIKE_ENGINE_CMD_PLANETARY_ORBIT_H diff --git a/engine/src/cmd/role_bitmask.h b/engine/src/cmd/role_bitmask.h index 0e4301ac12..fea9462412 100644 --- a/engine/src/cmd/role_bitmask.h +++ b/engine/src/cmd/role_bitmask.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _ROLE_BITMASK_H_ -#define _ROLE_BITMASK_H_ +#ifndef VEGA_STRIKE_ENGINE_CMD_ROLE_BITMASK_H +#define VEGA_STRIKE_ENGINE_CMD_ROLE_BITMASK_H #include <string> #include <vector> @@ -51,5 +49,4 @@ unsigned int getCapitalRoles(); const std::string &getRoleEvents(unsigned char ourrole, unsigned char theirs); //get AI ervent associated with this } -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_ROLE_BITMASK_H diff --git a/engine/src/cmd/script/c_alike/c_alike.h b/engine/src/cmd/script/c_alike/c_alike.h index 469b299221..ea740316fa 100644 --- a/engine/src/cmd/script/c_alike/c_alike.h +++ b/engine/src/cmd/script/c_alike/c_alike.h @@ -19,6 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +// NO HEADER GUARD /* c_alike scripting written by Alexander Rawass <alexannika@users.sourceforge.net> diff --git a/engine/src/cmd/script/c_alike/c_alike.tab.cpp.h b/engine/src/cmd/script/c_alike/c_alike.tab.cpp.h index b449e13de4..fdd0164866 100644 --- a/engine/src/cmd/script/c_alike/c_alike.tab.cpp.h +++ b/engine/src/cmd/script/c_alike/c_alike.tab.cpp.h @@ -19,10 +19,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +// NO HEADER GUARD #ifndef YYSTYPE #define YYSTYPE int #endif + #define L_ID 257 #define L_FLOATCONST 258 #define L_INTCONST 259 diff --git a/engine/src/cmd/script/flightgroup.h b/engine/src/cmd/script/flightgroup.h index 860ef8618a..04dbe37c69 100644 --- a/engine/src/cmd/script/flightgroup.h +++ b/engine/src/cmd/script/flightgroup.h @@ -23,10 +23,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_CMD_SCRIPT_FLIGHT_GROUP_H +#define VEGA_STRIKE_ENGINE_CMD_SCRIPT_FLIGHT_GROUP_H - -#ifndef _FLIGHTGROUP_H_ -#define _FLIGHTGROUP_H_ #include "cmd/container.h" #include "mission.h" #include <string> @@ -131,5 +130,4 @@ class CreateFlightgroup { class easyDomNode *domnode; }; -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_SCRIPT_FLIGHT_GROUP_H diff --git a/engine/src/cmd/script/mission.h b/engine/src/cmd/script/mission.h index 73e05da1b3..21274f8ab9 100644 --- a/engine/src/cmd/script/mission.h +++ b/engine/src/cmd/script/mission.h @@ -23,7 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_CMD_SCRIPT_MISSION_H +#define VEGA_STRIKE_ENGINE_CMD_SCRIPT_MISSION_H /* * xml Mission written by Alexander Rawass <alexannika@users.sourceforge.net> @@ -31,8 +32,6 @@ /// Enumerates functions for python modules /// -#ifndef _MISSION_H_ -#define _MISSION_H_ #include <gnuhash.h> #include <expat.h> @@ -769,5 +768,4 @@ class Mission { #endif //VS_MIS_SEL }; -#endif //_MISSION_H_ - +#endif //VEGA_STRIKE_ENGINE_CMD_SCRIPT_MISSION_H diff --git a/engine/src/cmd/script/mission_types.h b/engine/src/cmd/script/mission_types.h index ca6295598d..a3b30830a2 100644 --- a/engine/src/cmd/script/mission_types.h +++ b/engine/src/cmd/script/mission_types.h @@ -22,9 +22,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_CMD_SCRIPT_MISSION_TYPES_H +#define VEGA_STRIKE_ENGINE_CMD_SCRIPT_MISSION_TYPES_H -#ifndef _MISSION_TYPES_H_ -#define _MISSION_TYPES_H_ - -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_SCRIPT_MISSION_TYPES_H diff --git a/engine/src/cmd/script/msgcenter.h b/engine/src/cmd/script/msgcenter.h index 84279f138b..8d17ca429f 100644 --- a/engine/src/cmd/script/msgcenter.h +++ b/engine/src/cmd/script/msgcenter.h @@ -23,16 +23,13 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_CMD_SCRIPT_MSG_CENTER_H +#define VEGA_STRIKE_ENGINE_CMD_SCRIPT_MSG_CENTER_H /* * MessageCenter written by Alexander Rawass <alexannika@users.sourceforge.net> */ -#ifndef _MSGCENTER_H_ - -#define _MSGCENTER_H_ - #include <stdlib.h> #include <stdio.h> #include <errno.h> @@ -75,5 +72,4 @@ class MessageCenter { std::vector<gameMessage> messages; }; -#endif //_MSGCENTER_H_ - +#endif //VEGA_STRIKE_ENGINE_CMD_SCRIPT_MSG_CENTER_H diff --git a/engine/src/cmd/script/pythonmission.h b/engine/src/cmd/script/pythonmission.h index 832bd1e0cb..8ca39279c5 100644 --- a/engine/src/cmd/script/pythonmission.h +++ b/engine/src/cmd/script/pythonmission.h @@ -23,13 +23,14 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_CMD_SCRIPT_PYTHON_MISSION_H +#define VEGA_STRIKE_ENGINE_CMD_SCRIPT_PYTHON_MISSION_H - -#ifndef __PYTHON_MISSION_H__ -#define __PYTHON_MISSION_H__ #include <string> #include <vector> + class UnitContainer; + class PythonMissionBaseClass { protected: virtual void Destructor(); @@ -48,5 +49,4 @@ class PythonMissionBaseClass { virtual void UnPickle(std::string s); }; -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_SCRIPT_PYTHON_MISSION_H diff --git a/engine/src/cmd/terrain.h b/engine/src/cmd/terrain.h index 0bc0500454..d134a964a2 100644 --- a/engine/src/cmd/terrain.h +++ b/engine/src/cmd/terrain.h @@ -23,10 +23,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_CMD_TERRAIN_H +#define VEGA_STRIKE_ENGINE_CMD_TERRAIN_H - -#ifndef TERRAIN_H_ -#define TERRAIN_H_ #include "gfx/quadtree.h" #include "gfx/vec.h" @@ -71,5 +70,4 @@ class Terrain : public QuadTree { void EnableUpdate(); Vector GetUpVector(const Vector &pos); }; -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_TERRAIN_H diff --git a/engine/src/cmd/testcollection/unit.h b/engine/src/cmd/testcollection/unit.h index 60e8e77d93..89d9d8b9dd 100644 --- a/engine/src/cmd/testcollection/unit.h +++ b/engine/src/cmd/testcollection/unit.h @@ -23,10 +23,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_CMD_UNIT_TEST_H +#define VEGA_STRIKE_ENGINE_CMD_UNIT_TEST_H - -#ifndef __UNIT_TEST_H_ -#define __UNIT_TEST_H_ #include <stdio.h> class Unit { @@ -71,5 +70,5 @@ class Unit { } } }; -#endif +#endif //VEGA_STRIKE_ENGINE_CMD_UNIT_TEST_H diff --git a/engine/src/cmd/turret.h b/engine/src/cmd/turret.h index dcac3f8aa2..f78201b44e 100644 --- a/engine/src/cmd/turret.h +++ b/engine/src/cmd/turret.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef TURRET_H -#define TURRET_H +#ifndef VEGA_STRIKE_ENGINE_CMD_TURRET_H +#define VEGA_STRIKE_ENGINE_CMD_TURRET_H #include <string> #include <map> @@ -42,4 +40,4 @@ std::map<std::string, std::string> parseTurretSizes(); std::string getTurretSize(const std::string &size); Unit *CreateGenericTurret(std::string tur, int faction); -#endif // TURRET_H +#endif //VEGA_STRIKE_ENGINE_CMD_TURRET_H diff --git a/engine/src/cmd/unit_click.h b/engine/src/cmd/unit_click.h index 3849e50261..542835fe57 100644 --- a/engine/src/cmd/unit_click.h +++ b/engine/src/cmd/unit_click.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __UNIT_CLICK_CPP__ -#define __UNIT_CLICK_CPP__ +#ifndef VEGA_STRIKE_ENGINE_CMD_UNIT_CLICK_H +#define VEGA_STRIKE_ENGINE_CMD_UNIT_CLICK_H #include "vegastrike.h" #include "gfx/mesh.h" @@ -89,5 +87,4 @@ bool Unit::querySphereClickList(int mouseX, int mouseY, float err, Camera *activ return false; } -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_UNIT_CLICK_H diff --git a/engine/src/cmd/unit_collide.h b/engine/src/cmd/unit_collide.h index 5cb164456b..c24fb84ceb 100644 --- a/engine/src/cmd/unit_collide.h +++ b/engine/src/cmd/unit_collide.h @@ -19,10 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _CMD_COLLIDE_H_ -#define _CMD_COLLIDE_H_ +#ifndef VEGA_STRIKE_ENGINE_CMD_COLLIDE_H +#define VEGA_STRIKE_ENGINE_CMD_COLLIDE_H #define SAFE_COLLIDE_DEBUG #include "gfx/vec.h" @@ -344,5 +342,4 @@ struct collideTrees { static collideTrees *Get(const std::string &hash_key); }; -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_COLLIDE_H diff --git a/engine/src/cmd/unit_const_cache.h b/engine/src/cmd/unit_const_cache.h index a5e13b5db6..def7556216 100644 --- a/engine/src/cmd/unit_const_cache.h +++ b/engine/src/cmd/unit_const_cache.h @@ -25,8 +25,8 @@ */ -#ifndef __UNIT_CONST_CACHE_H -#define __UNIT_CONST_CACHE_H +#ifndef VEGA_STRIKE_ENGINE_CMD_UNIT_CONST_CACHE_H +#define VEGA_STRIKE_ENGINE_CMD_UNIT_CONST_CACHE_H #include "hashtable.h" #include <string> #include <gnuhash.h> @@ -114,5 +114,4 @@ class ClassCache { typedef ClassCache<Unit, StringIntKey> UnitConstCache; typedef ClassCache<Mesh, std::string> WeaponMeshCache; -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_UNIT_CONST_CACHE_H diff --git a/engine/src/cmd/unit_csv.h b/engine/src/cmd/unit_csv.h index 189efb92cc..fdaf2f81bd 100644 --- a/engine/src/cmd/unit_csv.h +++ b/engine/src/cmd/unit_csv.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __UNIT_CSV_H__ -#define __UNIT_CSV_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_UNIT_CSV_H +#define VEGA_STRIKE_ENGINE_CMD_UNIT_CSV_H extern void AddMeshes(std::vector<Mesh *> &xmeshes, float &randomstartframe, @@ -37,5 +35,4 @@ extern void AddMeshes(std::vector<Mesh *> &xmeshes, Flightgroup *fg, vector<unsigned int> *counts = NULL); -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_UNIT_CSV_H diff --git a/engine/src/cmd/unit_csv_factory.h b/engine/src/cmd/unit_csv_factory.h index e5a65053a2..79b9477370 100644 --- a/engine/src/cmd/unit_csv_factory.h +++ b/engine/src/cmd/unit_csv_factory.h @@ -21,10 +21,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef UNITCSVFACTORY_H -#define UNITCSVFACTORY_H +#ifndef VEGA_STRIKE_ENGINE_CMD_UNIT_CSV_FACTORY_H +#define VEGA_STRIKE_ENGINE_CMD_UNIT_CSV_FACTORY_H #include <map> #include <string> @@ -208,4 +206,4 @@ inline int UnitCSVFactory::GetVariable(std::string unit_key, std::string const & std::string GetUnitKeyFromNameAndFaction(const std::string unit_name, const std::string unit_faction); -#endif // UNITCSVFACTORY_H +#endif //VEGA_STRIKE_ENGINE_CMD_UNIT_CSV_FACTORY_H diff --git a/engine/src/cmd/unit_customize.h b/engine/src/cmd/unit_customize.h index a9860062c2..cb3117e29f 100644 --- a/engine/src/cmd/unit_customize.h +++ b/engine/src/cmd/unit_customize.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __UNIT_CUSTOMIZE_CPP__ -#define __UNIT_CUSTOMIZE_CPP__ +#ifndef VEGA_STRIKE_ENGINE_CMD_UNIT_CUSTOMIZE_H +#define VEGA_STRIKE_ENGINE_CMD_UNIT_CUSTOMIZE_H #include "images.h" #include "universe.h" @@ -68,5 +66,4 @@ bool Unit::UpgradeSubUnits(const Unit *up, extern char *GetUnitDir(const char *); -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_UNIT_CUSTOMIZE_H diff --git a/engine/src/cmd/unit_find.h b/engine/src/cmd/unit_find.h index 9bd4d9c8b6..8c6e93971a 100644 --- a/engine/src/cmd/unit_find.h +++ b/engine/src/cmd/unit_find.h @@ -23,10 +23,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_CMD_UNIT_FIND_H +#define VEGA_STRIKE_ENGINE_CMD_UNIT_FIND_H - -#ifndef _UNIT_FIND_H_ -#define _UNIT_FIND_H_ #include "unit_util.h" template<class Locator> @@ -320,5 +319,4 @@ class UnitPtrLocator { } }; -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_UNIT_FIND_H diff --git a/engine/src/cmd/unit_generic.h b/engine/src/cmd/unit_generic.h index 2c7486a920..3f3015f618 100644 --- a/engine/src/cmd/unit_generic.h +++ b/engine/src/cmd/unit_generic.h @@ -1,7 +1,7 @@ // -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- - -#ifndef __UNIT_GENERIC_H__ -#define __UNIT_GENERIC_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_UNIT_GENERIC_H +#define VEGA_STRIKE_ENGINE_CMD_UNIT_GENERIC_H +// Q: Why 2 header guards??? /* * unit_generic.cpp @@ -29,8 +29,8 @@ /***** Unit is the Unit class without GFX/Sound with AI *****/ -#ifndef _UNIT_H_ -#define _UNIT_H_ +#ifndef VEGA_STRIKE_ENGINE_CMD_UNIT_H +#define VEGA_STRIKE_ENGINE_CMD_UNIT_H #include "armed.h" #include "audible.h" @@ -1081,7 +1081,7 @@ inline void UnitCollection::UnitIterator::GetNextValidUnit() extern std::set<std::string> GetListOfDowngrades(); extern void ClearDowngradeMap(); -#endif +#endif //VEGA_STRIKE_ENGINE_CMD_UNIT_H /* ************************************************************************************** @@ -1091,5 +1091,5 @@ extern void ClearDowngradeMap(); -#endif +#endif //VEGA_STRIKE_ENGINE_CMD_UNIT_GENERIC_H diff --git a/engine/src/cmd/unit_json_factory.h b/engine/src/cmd/unit_json_factory.h index a651f7e8c4..b0aed97094 100644 --- a/engine/src/cmd/unit_json_factory.h +++ b/engine/src/cmd/unit_json_factory.h @@ -1,6 +1,3 @@ -#ifndef UNITJSONFACTORY_H -#define UNITJSONFACTORY_H - /* * unit_json_factory.cpp * @@ -24,6 +21,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_CMD_UNIT_JSON_FACTORY_H +#define VEGA_STRIKE_ENGINE_CMD_UNIT_JSON_FACTORY_H #include <string> @@ -35,4 +34,4 @@ class UnitJSONFactory { public: static void ParseJSON(VSFileSystem::VSFile &file); }; -#endif // UNITJSONFACTORY_H +#endif //VEGA_STRIKE_ENGINE_CMD_UNIT_JSON_FACTORY_H diff --git a/engine/src/cmd/unit_optimize_factory.h b/engine/src/cmd/unit_optimize_factory.h index babdb9fffd..e8b1f49756 100644 --- a/engine/src/cmd/unit_optimize_factory.h +++ b/engine/src/cmd/unit_optimize_factory.h @@ -1,6 +1,3 @@ -#ifndef UNITOPTIMIZEFACTORY_H -#define UNITOPTIMIZEFACTORY_H - /* * unit_optimize_factory.cpp * @@ -24,6 +21,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_CMD_UNIT_OPTIMIZE_FACTORY_H +#define VEGA_STRIKE_ENGINE_CMD_UNIT_OPTIMIZE_FACTORY_H #include <map> #include <string> @@ -38,4 +37,4 @@ class UnitOptimizeFactory const std::string& json_text, bool is_root); }; -#endif // UNITOPTIMIZEFACTORY_H +#endif //VEGA_STRIKE_ENGINE_CMD_UNIT_OPTIMIZE_FACTORY_H diff --git a/engine/src/cmd/unit_physics.h b/engine/src/cmd/unit_physics.h index ac5607d927..39ef737d01 100644 --- a/engine/src/cmd/unit_physics.h +++ b/engine/src/cmd/unit_physics.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __UNIT_PHYSICS_CPP__ -#define __UNIT_PHYSICS_CPP__ +#ifndef VEGA_STRIKE_ENGINE_CMD_UNIT_PHYSICS_H +#define VEGA_STRIKE_ENGINE_CMD_UNIT_PHYSICS_H #include "gfx/mesh.h" #include "lin_time.h" @@ -158,5 +157,4 @@ Vector Unit::ResolveForces(const Transformation &trans, const Matrix &transmat) return Movable::ResolveForces(trans, transmat); } -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_UNIT_PHYSICS_H diff --git a/engine/src/cmd/unit_type.h b/engine/src/cmd/unit_type.h index 6aefd82afa..58f78dad11 100644 --- a/engine/src/cmd/unit_type.h +++ b/engine/src/cmd/unit_type.h @@ -22,9 +22,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef UNIT_TYPE_H -#define UNIT_TYPE_H +#ifndef VEGA_STRIKE_ENGINE_CMD_UNIT_TYPE_H +#define VEGA_STRIKE_ENGINE_CMD_UNIT_TYPE_H // UnitType is already taken // TODO: rename to expected @@ -38,4 +37,4 @@ enum class UnitTypeEnum { unit }; -#endif // UNIT_TYPE_H +#endif //VEGA_STRIKE_ENGINE_CMD_UNIT_TYPE_H diff --git a/engine/src/cmd/unit_util.h b/engine/src/cmd/unit_util.h index 637102480d..c292da8908 100644 --- a/engine/src/cmd/unit_util.h +++ b/engine/src/cmd/unit_util.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __UNIT_UTIL_H__ -#define __UNIT_UTIL_H__ +#ifndef VEGA_STRIKE_ENGINE_CMD_UNIT_UTIL_H +#define VEGA_STRIKE_ENGINE_CMD_UNIT_UTIL_H #include <string> #include "unit_generic.h" @@ -93,4 +91,4 @@ void performDockingOperations(Unit *un, Unit *unitToDockWith, int actuallyDockP) float PercentOperational(Unit *un, string, string category, bool countHullAndArmorAsFull); } -#endif +#endif //VEGA_STRIKE_ENGINE_CMD_UNIT_UTIL_H diff --git a/engine/src/cmd/unit_xml.h b/engine/src/cmd/unit_xml.h index d30d7e087a..946e132b9f 100644 --- a/engine/src/cmd/unit_xml.h +++ b/engine/src/cmd/unit_xml.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _UNIT_XML_H -#define _UNIT_XML_H +#ifndef VEGA_STRIKE_ENGINE_CMD_UNIT_XML_H +#define VEGA_STRIKE_ENGINE_CMD_UNIT_XML_H #include "unit_generic.h" @@ -52,5 +50,4 @@ enum UNITLOADTYPE { DEFAULT, NO_MESH }; extern UNITLOADTYPE current_unit_load_mode; -#endif - +#endif //VEGA_STRIKE_ENGINE_CMD_UNIT_XML_H diff --git a/engine/src/cmd/upgradeable_unit.h b/engine/src/cmd/upgradeable_unit.h index 3b85bd2b1e..04ca13ae91 100644 --- a/engine/src/cmd/upgradeable_unit.h +++ b/engine/src/cmd/upgradeable_unit.h @@ -1,3 +1,4 @@ +// -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- /* * upgradeable_unit.h * @@ -21,11 +22,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -// -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- - -#ifndef UPGRADEABLEUNIT_H -#define UPGRADEABLEUNIT_H +#ifndef VEGA_STRIKE_ENGINE_CMD_UPGRADEABLE_UNIT_H +#define VEGA_STRIKE_ENGINE_CMD_UPGRADEABLE_UNIT_H #include <string> #include <vector> @@ -50,4 +48,4 @@ class UpgradeableUnit double &percentage); }; -#endif // UPGRADEABLEUNIT_H +#endif //VEGA_STRIKE_ENGINE_CMD_UPGRADEABLE_UNIT_H diff --git a/engine/src/cmd/vs_limits.h b/engine/src/cmd/vs_limits.h index 0e4adaa31d..ed12a4266d 100644 --- a/engine/src/cmd/vs_limits.h +++ b/engine/src/cmd/vs_limits.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef LIMITS_H -#define LIMITS_H +#ifndef VEGA_STRIKE_ENGINE_CMD_LIMITS_H +#define VEGA_STRIKE_ENGINE_CMD_LIMITS_H #include "gfx/vec.h" @@ -55,4 +53,4 @@ class Limits { float limitmin = -1; }; -#endif // LIMITS_H +#endif //VEGA_STRIKE_ENGINE_CMD_LIMITS_H diff --git a/engine/src/cmd/weapon_factory.h b/engine/src/cmd/weapon_factory.h index 4ef01e804b..cb8c34eebb 100644 --- a/engine/src/cmd/weapon_factory.h +++ b/engine/src/cmd/weapon_factory.h @@ -19,10 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef WEAPON_FACTORY_H -#define WEAPON_FACTORY_H +#ifndef VEGA_STRIKE_ENGINE_CMD_WEAPON_FACTORY_H +#define VEGA_STRIKE_ENGINE_CMD_WEAPON_FACTORY_H #include <string> #include <boost/property_tree/ptree.hpp> @@ -36,4 +34,4 @@ class WeaponFactory { void parseJSON(const std::string &weapon_text); }; -#endif // WEAPON_FACTORY_H +#endif //VEGA_STRIKE_ENGINE_CMD_WEAPON_FACTORY_H diff --git a/engine/src/cmd/weapon_info.h b/engine/src/cmd/weapon_info.h index 2ee38942a1..1e1ba7adf3 100644 --- a/engine/src/cmd/weapon_info.h +++ b/engine/src/cmd/weapon_info.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef WEAPON_INFO_H -#define WEAPON_INFO_H +#ifndef VEGA_STRIKE_ENGINE_CMD_WEAPON_INFO_H +#define VEGA_STRIKE_ENGINE_CMD_WEAPON_INFO_H #include "weapon_type.h" #include "gfx/vec.h" @@ -116,4 +114,4 @@ struct WeaponInfo { WeaponInfo *getWeapon(const std::string &key); -#endif // WEAPON_INFO_H +#endif //VEGA_STRIKE_ENGINE_CMD_WEAPON_INFO_H diff --git a/engine/src/cmd/weapon_type.h b/engine/src/cmd/weapon_type.h index 455ebdf570..fe79cf4bf0 100644 --- a/engine/src/cmd/weapon_type.h +++ b/engine/src/cmd/weapon_type.h @@ -19,10 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef WEAPONTYPE_H -#define WEAPONTYPE_H +#ifndef VEGA_STRIKE_ENGINE_CMD_WEAPON_TYPE_H +#define VEGA_STRIKE_ENGINE_CMD_WEAPON_TYPE_H #include <string> @@ -37,4 +35,4 @@ enum class WEAPON_TYPE { WEAPON_TYPE getWeaponTypeFromString(std::string type); std::string getFilenameFromWeaponType(WEAPON_TYPE type); -#endif // WEAPONTYPE_H +#endif //VEGA_STRIKE_ENGINE_CMD_WEAPON_TYPE_H diff --git a/engine/src/command.h b/engine/src/command.h index 45d48663d7..ae4230b0f8 100644 --- a/engine/src/command.h +++ b/engine/src/command.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef COMMANDINTERP -#define COMMANDINTERP +#ifndef VEGA_STRIKE_ENGINE_COMMAND_H +#define VEGA_STRIKE_ENGINE_COMMAND_H #include <iostream> #include <string> @@ -195,5 +194,6 @@ namespace ConsoleKeys { extern void BringConsole(const KBData &, KBSTATE a); } //#include "areas.h" -#endif + +#endif //VEGA_STRIKE_ENGINE_COMMAND_H diff --git a/engine/src/common/common.h b/engine/src/common/common.h index 562f9ec604..57fb02a368 100644 --- a/engine/src/common/common.h +++ b/engine/src/common/common.h @@ -15,6 +15,7 @@ * (at your option) any later version. * * * ***************************************************************************/ +// NO HEADER GUARD /* This file is for common (as in shared between vegastrike, vegasettings as vsconfig) stuff @@ -29,4 +30,3 @@ std::string getdatadir(); #endif - diff --git a/engine/src/config_xml.h b/engine/src/config_xml.h index 02e5adba91..66d09086bc 100644 --- a/engine/src/config_xml.h +++ b/engine/src/config_xml.h @@ -19,14 +19,13 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_CONFIG_XML_H +#define VEGA_STRIKE_ENGINE_CONFIG_XML_H /* * xml Configuration written by Alexander Rawass <alexannika@users.sourceforge.net> */ -#ifndef _VEGACONFIG_H_ -#define _VEGACONFIG_H_ - #include <expat.h> #include <string> #include <gnuhash.h> @@ -63,5 +62,4 @@ class GameVegaConfig : public VegaConfig { void checkHatswitch(int nr, configNode *node); }; -#endif //_VEGACONFIG_H_ - +#endif //VEGA_STRIKE_ENGINE_CONFIG_XML_H diff --git a/engine/src/configuration/configuration.h b/engine/src/configuration/configuration.h index 627d69ee77..4fef08fc19 100644 --- a/engine/src/configuration/configuration.h +++ b/engine/src/configuration/configuration.h @@ -23,8 +23,8 @@ */ -#ifndef CONFIGURATION_H -#define CONFIGURATION_H +#ifndef VEGA_STRIKE_ENGINE_CONFIG_CONFIGURATION_H +#define VEGA_STRIKE_ENGINE_CONFIG_CONFIGURATION_H #include <cstdint> #include <memory> @@ -463,4 +463,4 @@ class Configuration { extern std::shared_ptr<Configuration> configuration(); -#endif // CONFIGURATION_H +#endif //VEGA_STRIKE_ENGINE_CONFIG_CONFIGURATION_H diff --git a/engine/src/configuration/game_config.h b/engine/src/configuration/game_config.h index 3e9a8be11f..8c2380ce4b 100644 --- a/engine/src/configuration/game_config.h +++ b/engine/src/configuration/game_config.h @@ -21,10 +21,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef GAME_CONFIG_H -#define GAME_CONFIG_H +#ifndef VEGA_STRIKE_ENGINE_CONFIG_GAME_CONFIG_H +#define VEGA_STRIKE_ENGINE_CONFIG_GAME_CONFIG_H #include <boost/property_tree/ptree.hpp> #include <boost/property_tree/xml_parser.hpp> @@ -131,4 +129,4 @@ extern GameConfig& GetGameConfig(); } -#endif // GAME_CONFIG_H +#endif //VEGA_STRIKE_ENGINE_CONFIG_GAME_CONFIG_H diff --git a/engine/src/configxml.h b/engine/src/configxml.h index 51a78f56ab..9529918f88 100644 --- a/engine/src/configxml.h +++ b/engine/src/configxml.h @@ -19,14 +19,13 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_SIMPLE_CONFIG_H +#define VEGA_STRIKE_ENGINE_SIMPLE_CONFIG_H /* * xml Configuration written by Alexander Rawass <alexannika@users.sourceforge.net> */ -#ifndef _VEGASIMPLECONFIG_H_ -#define _VEGASIMPLECONFIG_H_ - #include <expat.h> #include <string> #include "xml_support.h" @@ -121,5 +120,5 @@ class VegaConfig { } }; -#endif //_VEGACONFIG_H_ +#endif //VEGA_STRIKE_ENGINE_SIMPLE_CONFIG_H diff --git a/engine/src/damage/core_vector.h b/engine/src/damage/core_vector.h index f8a1845781..f57965e422 100644 --- a/engine/src/damage/core_vector.h +++ b/engine/src/damage/core_vector.h @@ -1,5 +1,5 @@ /* - * health_tests.cpp + * core_vector.h * * Copyright (C) 2021 Roy Falk * Copyright (C) 2022 Stephen G. Tuggy @@ -21,10 +21,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef COREVECTOR_H -#define COREVECTOR_H +#ifndef VEGA_STRIKE_ENGINE_DAMAGE_COREVECTOR_H +#define VEGA_STRIKE_ENGINE_DAMAGE_COREVECTOR_H struct CoreVector { float i = 0, j = 0, k = 0; @@ -36,4 +34,4 @@ struct CoreVector { } }; -#endif // COREVECTOR_H +#endif //VEGA_STRIKE_ENGINE_DAMAGE_COREVECTOR_H diff --git a/engine/src/damage/damage.h b/engine/src/damage/damage.h index 3521961f1e..522abcc0a0 100644 --- a/engine/src/damage/damage.h +++ b/engine/src/damage/damage.h @@ -21,10 +21,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef DAMAGE_H -#define DAMAGE_H +#ifndef VEGA_STRIKE_ENGINE_DAMAGE_DAMAGE_H +#define VEGA_STRIKE_ENGINE_DAMAGE_DAMAGE_H #include <vector> @@ -79,4 +77,4 @@ struct InflictedDamage { InflictedDamage() = delete; }; -#endif // DAMAGE_H +#endif //VEGA_STRIKE_ENGINE_DAMAGE_DAMAGE_H diff --git a/engine/src/damage/damageable_layer.h b/engine/src/damage/damageable_layer.h index 27e29d55fd..e316de1071 100644 --- a/engine/src/damage/damageable_layer.h +++ b/engine/src/damage/damageable_layer.h @@ -19,10 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef DAMAGEABLELAYER_H -#define DAMAGEABLELAYER_H +#ifndef VEGA_STRIKE_ENGINE_DAMAGE_DAMAGEABLE_LAYER_H +#define VEGA_STRIKE_ENGINE_DAMAGE_DAMAGEABLE_LAYER_H #include <vector> @@ -97,4 +95,4 @@ struct DamageableLayer { void UpdateRegeneration(const float &new_regeneration_value); }; -#endif // DAMAGEABLELAYER_H +#endif //VEGA_STRIKE_ENGINE_DAMAGE_DAMAGEABLE_LAYER_H diff --git a/engine/src/damage/damageable_object.h b/engine/src/damage/damageable_object.h index 02155295a1..20d37f2459 100644 --- a/engine/src/damage/damageable_object.h +++ b/engine/src/damage/damageable_object.h @@ -21,10 +21,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef DAMAGEABLEOBJECT_H -#define DAMAGEABLEOBJECT_H +#ifndef VEGA_STRIKE_ENGINE_DAMAGE_DAMAGEABLE_OBJECT_H +#define VEGA_STRIKE_ENGINE_DAMAGE_DAMAGEABLE_OBJECT_H #include "damage.h" #include "damageable_layer.h" @@ -52,4 +50,4 @@ struct DamageableObject { void *(*residual_debris)(DamageableObject object); }; -#endif // DAMAGEABLEOBJECT_H +#endif //VEGA_STRIKE_ENGINE_DAMAGE_DAMAGEABLE_OBJECT_H diff --git a/engine/src/damage/facet_configuration.h b/engine/src/damage/facet_configuration.h index 15f91d4cfb..f78bbdbb61 100644 --- a/engine/src/damage/facet_configuration.h +++ b/engine/src/damage/facet_configuration.h @@ -19,10 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef FACET_CONFIGURATION_H -#define FACET_CONFIGURATION_H +#ifndef VEGA_STRIKE_ENGINE_DAMAGE_FACET_CONFIGURATION_H +#define VEGA_STRIKE_ENGINE_DAMAGE_FACET_CONFIGURATION_H #include "core_vector.h" #include <float.h> @@ -73,4 +71,4 @@ enum class FacetName { // auto as_integer(Enumeration const value) -#endif // FACET_CONFIGURATION_H +#endif //VEGA_STRIKE_ENGINE_DAMAGE_FACET_CONFIGURATION_H diff --git a/engine/src/damage/health.h b/engine/src/damage/health.h index 531689e180..5d6462e24c 100644 --- a/engine/src/damage/health.h +++ b/engine/src/damage/health.h @@ -21,10 +21,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef HEALTH_H -#define HEALTH_H +#ifndef VEGA_STRIKE_ENGINE_DAMAGE_HEALTH_H +#define VEGA_STRIKE_ENGINE_DAMAGE_HEALTH_H #include "damage.h" @@ -115,4 +113,4 @@ struct Health { void Update(float health); }; -#endif // HEALTH_H +#endif //VEGA_STRIKE_ENGINE_DAMAGE_HEALTH_H diff --git a/engine/src/debug_vs.h b/engine/src/debug_vs.h index 6f32f676d4..ac66b593b1 100644 --- a/engine/src/debug_vs.h +++ b/engine/src/debug_vs.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef _DEBUG_VS_H_ -#define _DEBUG_VS_H_ +#ifndef VEGA_STRIKE_ENGINE_DEBUG_VS_H +#define VEGA_STRIKE_ENGINE_DEBUG_VS_H //#define VS_DEBUG //#define VS_DEBUG1 @@ -40,7 +39,7 @@ inline void VS_DEBUG_ERROR() { #define VSCONSTRUCT3(a) #define VSDESTRUCT3 -#else +#else //VS_DEBUG void VS_DEBUG_ERROR(); #error @@ -72,17 +71,18 @@ extern Hashtable< long, char, 65535 >destructed; #ifdef VS_DEBUG2 #define VSCONSTRUCT2( a ) VSCONST( a ) #define VSDESTRUCT2 VSDEST + #ifdef VS_DEBUG3 #define VSCONSTRUCT3( a ) VSCONST( a ) #define VSDESTRUCT3 VSDEST - -#else +#else //VS_DEBUG3 #define VSCONSTRUCT2( a ) #define VSDESTRUCT2 #define VSCONSTRUCT3( a ) #define VSDESTRUCT3 -#endif -#else +#endif //VS_DEBUG3 + +#else //VS_DEBUG2 #define VSCONSTRUCT1( a ) #define VSDESCRUCT1 #define VSCONSTRUCT2( a ) @@ -90,7 +90,8 @@ extern Hashtable< long, char, 65535 >destructed; #define VSCONSTRUCT3( a ) #define VSDESCRUCT3 -#endif -#endif -#endif +#endif //VS_DEBUG2 + +#endif //VS_DEBUG +#endif //VEGA_STRIKE_ENGINE_DEBUG_VS_H diff --git a/engine/src/easydom.h b/engine/src/easydom.h index acb611b534..d80d0ad948 100644 --- a/engine/src/easydom.h +++ b/engine/src/easydom.h @@ -19,14 +19,13 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_EASYDOM_H +#define VEGA_STRIKE_ENGINE_EASYDOM_H /* * easyDom - easy DOM for expat - written by Alexander Rawass <alexannika@users.sourceforge.net> */ -#ifndef _EASYDOM_H_ -#define _EASYDOM_H_ #include <expat.h> #include <string> #include <vector> @@ -293,5 +292,4 @@ class easyDomFactory { domNodeType *topnode; }; -#endif //_EASYDOM_H_ - +#endif //VEGA_STRIKE_ENGINE_EASYDOM_H diff --git a/engine/src/endianness.h b/engine/src/endianness.h index c5dab75c6d..07196d04e9 100644 --- a/engine/src/endianness.h +++ b/engine/src/endianness.h @@ -19,28 +19,28 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_ENDIANNESS_H +#define VEGA_STRIKE_ENGINE_ENDIANNESS_H -#ifndef _ENDIANNESS_H -#define _ENDIANNESS_H double DONTUSE__NXSwapBigDoubleToLittleEndian(double x); #if defined (__HAIKU__) //For unknow reasons, Haiku don't fit into any case below #include <endian.h> #elif defined (BSD) || defined (__FreeBSD__) #include <machine/endian.h> -#else +#else //defined (__HAIKU__) #if defined (IRIX) # include <sys/endian.h> #elif !defined (_WIN32) && !defined (__CYGWIN__) && !defined (SOLARIS) # include <endian.h> - #else + #else //defined (IRIX) # define __BIG_ENDIAN 1 # define __LITTLE_ENDIAN 0 # define __BYTE_ORDER 0 - #endif -#endif + #endif //defined (IRIX) +#endif //defined (__HAIKU__) #if defined (__APPLE__) #if defined (__BIG_ENDIAN__) @@ -49,18 +49,18 @@ double DONTUSE__NXSwapBigDoubleToLittleEndian(double x); #define le16_to_cpu( x ) ( (unsigned long) OSSwapLittleToHostInt16( (uint16_t) x ) ) #define le32_to_cpu( x ) ( (unsigned short) OSSwapLittleToHostInt32( (uint32_t) x ) ) #define le64_to_cpu( x ) ( (unsigned long long) OSSwapLittleToHostInt64( (uint64_t) x ) ) - #else + #else //defined (__x86_64__) #include <architecture/byte_order.h> #define le16_to_cpu( x ) NXSwapLittleShortToHost( x ) #define le32_to_cpu( x ) NXSwapLittleLongToHost( x ) #define le64_to_cpu( x ) NXSwapLittleLongLongToHost( x ) - #endif - #else + #endif //defined (__x86_64__) + #else //defined (__BIG_ENDIAN__) #define le32_to_cpu( x ) (x) #define le16_to_cpu( x ) (x) #define le64_to_cpu( x ) (x) - #endif -#else + #endif //defined (__BIG_ENDIAN__) +#else //defined (__APPLE__) #if defined (IRIX) || (defined (__SVR4) && defined (__sun )) #include <sys/types.h> # if BYTE_ORDER == BIG_ENDIAN /* depends on MIPSEB or MIPSEL and SGIAPI */ @@ -71,23 +71,23 @@ double DONTUSE__NXSwapBigDoubleToLittleEndian(double x); |( (uint32_t) (x)>>24 ) ) # define le16_to_cpu( x ) ( ( (x&0xFF)<<8 )|( (unsigned short) (x)>>8 ) ) # define le64_to_cpu( x ) ( DONTUSE__NXSwapBigDoubleToLittleEndian( x ) ) - # else + # else //if BYTE_ORDER == BIG_ENDIAN # define le32_to_cpu( x ) (x) # define le16_to_cpu( x ) (x) # define le64_to_cpu( x ) (x) - # endif + # endif //if BYTE_ORDER == BIG_ENDIAN #elif __BYTE_ORDER == __BIG_ENDIAN && !defined (BSD) && !defined (__FreeBSD__) # include <byteswap.h> # define le32_to_cpu( x ) ( bswap_32( x ) ) # define le16_to_cpu( x ) ( bswap_16( x ) ) # define le64_to_cpu( x ) ( DONTUSE__NXSwapBigDoubleToLittleEndian( x ) ) - #else + #else //defined (IRIX) || (defined (__SVR4) && defined (__sun )) # define le32_to_cpu(x) (x) # define le16_to_cpu(x) (x) # define le64_to_cpu(x) (x) - #endif -#endif + #endif //defined (IRIX) || (defined (__SVR4) && defined (__sun )) +#endif //defined (__APPLE__) inline float VSSwapHostFloatToLittle(float x) { union LILfloat { @@ -125,5 +125,5 @@ inline double DONTUSE__NXSwapBigDoubleToLittleEndian(double x) { return l.d; } -#endif //_ENDIANNESS_H +#endif //VEGA_STRIKE_ENGINE_ENDIANNESS_H diff --git a/engine/src/faction_generic.h b/engine/src/faction_generic.h index 7db4ef67d7..4efb64c890 100644 --- a/engine/src/faction_generic.h +++ b/engine/src/faction_generic.h @@ -19,9 +19,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_FACTION_GENERIC_H +#define VEGA_STRIKE_ENGINE_FACTION_GENERIC_H -#ifndef __FACTIONGENERIC_H -#define __FACTIONGENERIC_H #include <string> #include <boost/shared_ptr.hpp> //#include <gnuhash.h> @@ -181,5 +181,5 @@ void LoadFactionPlaylists(); void LoadContrabandLists(); }; -#endif +#endif //VEGA_STRIKE_ENGINE_FACTION_GENERIC_H diff --git a/engine/src/ffmpeg_init.h b/engine/src/ffmpeg_init.h index ae13a654d6..fea94c0c4c 100644 --- a/engine/src/ffmpeg_init.h +++ b/engine/src/ffmpeg_init.h @@ -19,12 +19,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_FFMPEG_INIT_H +#define VEGA_STRIKE_ENGINE_FFMPEG_INIT_H // //C++ Interface: FFMpeg initialization // -#ifndef __FFMPEG_INIT_H__INCLUDED__ -#define __FFMPEG_INIT_H__INCLUDED__ namespace FFMpeg { void initLibraries(); @@ -35,61 +35,64 @@ void initLibraries(); extern "C" { #ifdef _WIN32 #define HAVE_FFMPEG_SWSCALE_H -#endif +#endif //_WIN32 + #ifdef HAVE_FFMPEG_SWSCALE_H //Not sure how many people have swscale. #include <ffmpeg/swscale.h> - #else + #else //HAVE_FFMPEG_SWSCALE_H #ifdef HAVE_LIBSWSCALE_SWSCALE_H #include <libswscale/swscale.h> - #else + #else //HAVE_LIBSWSCALE_SWSCALE_H #ifdef HAVE_SWSCALE_H #include <swscale.h> - #else + #else //HAVE_SWSCALE_H #define DEPRECATED_IMG_CONVERT 1 - #endif - #endif - #endif + #endif //HAVE_SWSCALE_H + #endif //HAVE_LIBSWSCALE_SWSCALE_H + #endif //HAVE_FFMPEG_SWSCALE_H + #ifdef HAVE_LIBAVCODEC_AVCODEC_H #include <libavcodec/avcodec.h> - #else + #else //HAVE_LIBAVCODEC_AVCODEC_H #ifdef HAVE_AVCODEC_H #include <avcodec.h> - #else + #else //HAVE_AVCODEC_H #include <ffmpeg/avcodec.h> - #endif - #endif + #endif //HAVE_AVCODEC_H + #endif //HAVE_LIBAVCODEC_AVCODEC_H + #ifdef HAVE_LIBAVFORMAT_AVFORMAT_H #include <libavformat/avformat.h> - #else + #else //HAVE_LIBAVFORMAT_AVFORMAT_H #ifdef HAVE_AVFORMAT_H #include <avformat.h> - #else + #else //HAVE_AVFORMAT_H #include <ffmpeg/avformat.h> - #endif - #endif + #endif //HAVE_AVFORMAT_H + #endif //HAVE_LIBAVFORMAT_AVFORMAT_H + #ifdef HAVE_LIBAVFORMAT_AVIO_H #include <libavformat/avio.h> - #else + #else //HAVE_LIBAVFORMAT_AVIO_H #ifdef HAVE_AVIO_H #include <avio.h> - #else + #else //HAVE_AVIO_H #include <ffmpeg/avio.h> - #endif - #endif + #endif //HAVE_AVIO_H + #endif //HAVE_LIBAVFORMAT_AVIO_H } #if (LIBAVCODEC_VERSION_MAJOR > 52) #define CODEC_TYPE_AUDIO AVMEDIA_TYPE_AUDIO #define CODEC_TYPE_VIDEO AVMEDIA_TYPE_VIDEO -#else +#else //(LIBAVCODEC_VERSION_MAJOR > 52) #ifndef avformat_open_input #define avformat_open_input(ctx, path, fmt, ap) av_open_input_file(ctx, path, fmt, 0, ap) -#endif -#endif - +#endif //avformat_open_input +#endif //(LIBAVCODEC_VERSION_MAJOR > 52) -#endif -#endif //__FFMPEG_INIT_H__INCLUDED__ +#endif //HAVE_FFMPEG +#endif //VEGA_STRIKE_ENGINE_FFMPEG_INIT_H diff --git a/engine/src/file_main.h b/engine/src/file_main.h index 2644516c6f..4eadf87f47 100644 --- a/engine/src/file_main.h +++ b/engine/src/file_main.h @@ -19,9 +19,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_FILE_MAIN_H +#define VEGA_STRIKE_ENGINE_FILE_MAIN_H -#ifndef _FILE_MAIN_H_ -#define _FILE_MAIN_H_ #include <stdio.h> #include <string.h> //#include "gfxlib.h" @@ -153,4 +153,4 @@ inline void SetPosition(long position) { fpread.GoTo(position); } -#endif +#endif //VEGA_STRIKE_ENGINE_FILE_MAIN_H diff --git a/engine/src/force_feedback.h b/engine/src/force_feedback.h index e51ee1b790..9563472f80 100644 --- a/engine/src/force_feedback.h +++ b/engine/src/force_feedback.h @@ -19,6 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_FORCE_FEEDBACK_H +#define VEGA_STRIKE_ENGINE_FORCE_FEEDBACK_H /* * Force Feedback support by Alexander Rawass <alexannika@users.sourceforge.net> @@ -26,8 +28,6 @@ //#define HAVE_FORCE_FEEDBACK 1 -#ifndef _FORCE_FEEDBACK_H_ -#define _FORCE_FEEDBACK_H_ #ifndef _WIN32 #include <sys/types.h> #include <sys/stat.h> @@ -36,7 +36,8 @@ #include <unistd.h> #include <string.h> #include <sys/ioctl.h> -#endif +#endif //_WIN32 + #include <stdio.h> #if HAVE_FORCE_FEEDBACK @@ -51,7 +52,7 @@ #define _is( x ) ( (int) ( 3.2768*( (float) x ) ) ) -#endif //have_force_feedback +#endif //HAVE_FORCE_FEEDBACK #define ALL_EFFECTS 1 @@ -64,15 +65,15 @@ enum vseffects { eff_beam_on, eff_beam_off, //beam eff_missile_jerk, eff_missile_vibrate, //missile eff_hit_jerk, eff_hit_vibrate, //shield hits -#endif +#endif //ALL_EFFECTS eff_force //additional force }; #if ALL_EFFECTS #define N_EFFECTS 15 -#else +#else //ALL_EFFECTS #define N_EFFECTS 9 -#endif +#endif //ALL_EFFECTS class ForceFeedback { public: @@ -114,8 +115,7 @@ class ForceFeedback { double min_effect_time; bool is_played[N_EFFECTS]; -#endif //have_force_feedback +#endif //HAVE_FORCE_FEEDBACK }; -#endif //_FORCE_FEEDBACK_H_ - +#endif //VEGA_STRIKE_ENGINE_FORCE_FEEDBACK_H diff --git a/engine/src/functors.h b/engine/src/functors.h index b23aed131b..60a2db2ada 100644 --- a/engine/src/functors.h +++ b/engine/src/functors.h @@ -19,9 +19,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +// NO HEADER GUARD + #include <cstdlib> + #ifdef FUNCTORS_INC -#else +#else //FUNCTORS_INC #define FUNCTORS_INC 1 class Attributes { public: @@ -294,7 +297,7 @@ class Functor : public TFunctor { } }; -#endif +#endif //FUNCTORS_INC /* * Local variables: @@ -304,4 +307,3 @@ class Functor : public TFunctor { * vim600: sw=4 ts=4 fdm=marker * vim<600: sw=4 ts=4 */ - diff --git a/engine/src/galaxy.h b/engine/src/galaxy.h index 198ec5ba0b..dfff8421af 100644 --- a/engine/src/galaxy.h +++ b/engine/src/galaxy.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef GALAXY_H -#define GALAXY_H +#ifndef VEGA_STRIKE_ENGINE_GALAXY_H +#define VEGA_STRIKE_ENGINE_GALAXY_H #include <boost/property_tree/ptree.hpp> #include <boost/property_tree/ptree.hpp> @@ -44,4 +43,4 @@ class Galaxy { map<string, map<string, map<string, string>>> systems; // sectors-systems-variables }; -#endif // GALAXY_H +#endif //VEGA_STRIKE_ENGINE_GALAXY_H diff --git a/engine/src/galaxy_gen.h b/engine/src/galaxy_gen.h index 59b23fa92e..9ffce8a3cd 100644 --- a/engine/src/galaxy_gen.h +++ b/engine/src/galaxy_gen.h @@ -19,10 +19,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_GALAXY_GEN_H +#define VEGA_STRIKE_ENGINE_GALAXY_GEN_H - -#ifndef _STARSYSGEN_H_ -#define _STARSYSGEN_H_ #include <vector> #include <string> using std::string; @@ -66,5 +65,5 @@ std::string getStarSystemSector(const std::string &in); string getUniversePath(); void readnames(vector<string> &entity, const char *filename); void generateStarSystem(SystemInfo &si); -#endif +#endif //VEGA_STRIKE_ENGINE_GALAXY_GEN_H diff --git a/engine/src/galaxy_xml.h b/engine/src/galaxy_xml.h index f26977a35a..8d86aba8af 100644 --- a/engine/src/galaxy_xml.h +++ b/engine/src/galaxy_xml.h @@ -19,10 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef GALAXY_XML_H_ -#define GALAXY_XML_H_ +#ifndef VEGA_STRIKE_ENGINE_GALAXY_XML_H +#define VEGA_STRIKE_ENGINE_GALAXY_XML_H #include <string> #include <map> @@ -132,5 +130,6 @@ class SubHeirarchy : public vsUMap<std::string, class SGalaxy> {}; std::string getStarSystemFileName(const std::string &input); std::string getStarSystemName(const std::string &in); std::string getStarSystemSector(const std::string &in); -#endif + +#endif //VEGA_STRIKE_ENGINE_GALAXY_XML_H diff --git a/engine/src/gamemenu.h b/engine/src/gamemenu.h index 2cf372717b..1f0db7dab9 100644 --- a/engine/src/gamemenu.h +++ b/engine/src/gamemenu.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __GAMEMENU_H__ -#define __GAMEMENU_H__ +#ifndef VEGA_STRIKE_ENGINE_GAME_MENU_H +#define VEGA_STRIKE_ENGINE_GAME_MENU_H #include "gui/windowcontroller.h" #include "gui/simplepicker.h" @@ -88,5 +87,5 @@ class NetActionConfirm : public WindowController { virtual bool confirmedNetSaveGame(); }; -#endif +#endif //VEGA_STRIKE_ENGINE_GAME_MENU_H diff --git a/engine/src/gfx/aligned.h b/engine/src/gfx/aligned.h index f3f7837394..46b7373780 100644 --- a/engine/src/gfx/aligned.h +++ b/engine/src/gfx/aligned.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __ALIGNED_H -#define __ALIGNED_H +#ifndef VEGA_STRIKE_ENGINE_GFX_ALIGNED_H +#define VEGA_STRIKE_ENGINE_GFX_ALIGNED_H #include <memory> #include <cstddef> @@ -203,5 +202,4 @@ typename COLL::pointer coll_start_pointer(COLL &a) { return aligned_allocator_traits<typename COLL::allocator_type>::ifaligned_start_pointer(a.get_allocator(), a[0]); } -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_ALIGNED_H diff --git a/engine/src/gfx/ani_texture.h b/engine/src/gfx/ani_texture.h index 2e6a8236f5..a8ad8def4b 100644 --- a/engine/src/gfx/ani_texture.h +++ b/engine/src/gfx/ani_texture.h @@ -19,10 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __ANI_TEXTURE_H__ -#define __ANI_TEXTURE_H__ +#ifndef VEGA_STRIKE_ENGINE_GFX_ANI_TEXTURE_H +#define VEGA_STRIKE_ENGINE_GFX_ANI_TEXTURE_H #include "aux_texture.h" #include "vsfilesystem.h" @@ -214,5 +212,4 @@ class AnimatedTexture : public Texture { bool detailtex = false); }; -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_ANI_TEXTURE_H diff --git a/engine/src/gfx/animation.h b/engine/src/gfx/animation.h index d1f9984b3e..81d559521b 100644 --- a/engine/src/gfx/animation.h +++ b/engine/src/gfx/animation.h @@ -20,10 +20,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef ANIMATION_H - -#define ANIMATION_H +#ifndef VEGA_STRIKE_ENGINE_GFX_ANIMATION_H +#define VEGA_STRIKE_ENGINE_GFX_ANIMATION_H #include "lin_time.h" @@ -101,5 +99,4 @@ class Animation : public AnimatedTexture { void SetOrientation(const Vector &p, const Vector &q, const Vector &r); }; -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_ANIMATION_H diff --git a/engine/src/gfx/aux_logo.h b/engine/src/gfx/aux_logo.h index c760ee2ee5..800d3e0dd5 100644 --- a/engine/src/gfx/aux_logo.h +++ b/engine/src/gfx/aux_logo.h @@ -20,10 +20,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef LOGO_H_ -#define LOGO_H_ +#ifndef VEGA_STRIKE_ENGINE_GFX_LOGO_H +#define VEGA_STRIKE_ENGINE_GFX_LOGO_H #include "matrix.h" #include "gfxlib.h" @@ -78,5 +76,4 @@ class Logo { void Draw(const Matrix &m); }; -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_LOGO_H diff --git a/engine/src/gfx/aux_palette.h b/engine/src/gfx/aux_palette.h index 48e5170a7f..cc927e38c1 100644 --- a/engine/src/gfx/aux_palette.h +++ b/engine/src/gfx/aux_palette.h @@ -23,10 +23,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_GFX_PALETTE_H +#define VEGA_STRIKE_ENGINE_GFX_PALETTE_H - -#ifndef PALETTE_H_ -#define PALETTE_H_ void ShiftPalette(unsigned char[], double, double, double, double, double, double); -#endif +#endif //VEGA_STRIKE_ENGINE_GFX_PALETTE_H diff --git a/engine/src/gfx/aux_texture.h b/engine/src/gfx/aux_texture.h index eeddf5be27..a1a442d0d5 100644 --- a/engine/src/gfx/aux_texture.h +++ b/engine/src/gfx/aux_texture.h @@ -21,10 +21,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_GFX_TEXTURE_H +#define VEGA_STRIKE_ENGINE_GFX_TEXTURE_H - -#ifndef _TEXTURE_H_ -#define _TEXTURE_H_ #include "vsimage.h" #include "gfxlib.h" #include "gfxlib_struct.h" @@ -282,5 +281,4 @@ class Texture : public ::VSImage { virtual void Prioritize(float); }; -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_TEXTURE_H diff --git a/engine/src/gfx/background.h b/engine/src/gfx/background.h index b70c15b37d..c94ad88083 100644 --- a/engine/src/gfx/background.h +++ b/engine/src/gfx/background.h @@ -24,10 +24,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef BACKGROUND_H -#define BACKGROUND_H +#ifndef VEGA_STRIKE_ENGINE_GFX_BACKGROUND_H +#define VEGA_STRIKE_ENGINE_GFX_BACKGROUND_H #include "gfxlib_struct.h" @@ -63,5 +61,4 @@ class Background { BackgroundClone Cache(); }; -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_BACKGROUND_H diff --git a/engine/src/gfx/boltdrawmanager.h b/engine/src/gfx/boltdrawmanager.h index f039184034..0935255dde 100644 --- a/engine/src/gfx/boltdrawmanager.h +++ b/engine/src/gfx/boltdrawmanager.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef BOLTDRAWMANAGER_H -#define BOLTDRAWMANAGER_H +#ifndef VEGA_STRIKE_ENGINE_GFX_BOLT_DRAW_MANAGER_H +#define VEGA_STRIKE_ENGINE_GFX_BOLT_DRAW_MANAGER_H #include "gfx/decalqueue.h" #include "bolt.h" @@ -64,4 +62,4 @@ class BoltDrawManager { static void Draw(); }; -#endif // BOLTDRAWMANAGER_H +#endif //VEGA_STRIKE_ENGINE_GFX_BOLT_DRAW_MANAGER_H diff --git a/engine/src/gfx/camera.h b/engine/src/gfx/camera.h index d6d2e03c45..e089463bca 100644 --- a/engine/src/gfx/camera.h +++ b/engine/src/gfx/camera.h @@ -21,14 +21,13 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_GFX_CAMERA_H +#define VEGA_STRIKE_ENGINE_GFX_CAMERA_H #include "matrix.h" #include "gfxlib.h" #include "physics.h" -#ifndef _CAMERA_H_ -#define _CAMERA_H_ //class PlanetaryTransform; commented out by chuck_starchaser --never used #include "cmd/container.h" class Nebula; @@ -185,5 +184,4 @@ class Camera { void RestoreViewPort(float xoffset, float yoffset); }; -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_CAMERA_H diff --git a/engine/src/gfx/car_assist.h b/engine/src/gfx/car_assist.h index a0b1249098..f5bf6ec629 100644 --- a/engine/src/gfx/car_assist.h +++ b/engine/src/gfx/car_assist.h @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +// NO HEADER GUARD #include "xml_support.h" using XMLSupport::EnumMap; diff --git a/engine/src/gfx/cockpit.h b/engine/src/gfx/cockpit.h index a9c8a0c87b..6dda62057b 100644 --- a/engine/src/gfx/cockpit.h +++ b/engine/src/gfx/cockpit.h @@ -1,5 +1,4 @@ // -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- - /** * cockpit.h * @@ -25,10 +24,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_GFX_COCKPIT_H +#define VEGA_STRIKE_ENGINE_GFX_COCKPIT_H - -#ifndef _COCKPIT_H_ -#define _COCKPIT_H_ #include "gfx/cockpit_generic.h" #include "gfxlib.h" #include "gfxlib_struct.h" @@ -270,5 +268,5 @@ class GameCockpit : public Cockpit { /// Override to use a specific kind of sound implementation SoundContainer *soundImpl(const SoundContainer &specs); }; -#endif +#endif //VEGA_STRIKE_ENGINE_GFX_COCKPIT_H diff --git a/engine/src/gfx/cockpit_generic.h b/engine/src/gfx/cockpit_generic.h index 9e56d61872..47cfd881ac 100644 --- a/engine/src/gfx/cockpit_generic.h +++ b/engine/src/gfx/cockpit_generic.h @@ -22,10 +22,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_GFX_COCKPIT_GENERIC_H +#define VEGA_STRIKE_ENGINE_GFX_COCKPIT_GENERIC_H - -#ifndef _COCKPIT_GENERIC_H_ -#define _COCKPIT_GENERIC_H_ #include "xml_support.h" #include "cmd/container.h" #include <vector> @@ -471,5 +470,5 @@ class Cockpit { /// Override to use a specific kind of sound implementation virtual SoundContainer *soundImpl(const SoundContainer &specs); }; -#endif +#endif //VEGA_STRIKE_ENGINE_GFX_COCKPIT_GENERIC_H diff --git a/engine/src/gfx/cockpit_gfx.h b/engine/src/gfx/cockpit_gfx.h index 88b9589a88..120d896c81 100644 --- a/engine/src/gfx/cockpit_gfx.h +++ b/engine/src/gfx/cockpit_gfx.h @@ -1,5 +1,4 @@ // -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- - /* * cockpit_gfx.h * @@ -24,9 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef COCKPITGFX_H -#define COCKPITGFX_H +#ifndef VEGA_STRIKE_ENGINE_GFX_COCKPIT_GFX_H +#define VEGA_STRIKE_ENGINE_GFX_COCKPIT_GFX_H #include "gfx/vec.h" #include "gfx/radar/sensor.h" @@ -99,4 +97,4 @@ void DrawTargetGauges( Unit *target, Gauge *gauges[] ); float computeLockingSymbol( Unit *par ); -#endif // COCKPITGFX_H +#endif //VEGA_STRIKE_ENGINE_GFX_COCKPIT_GFX_H diff --git a/engine/src/gfx/cockpit_gfx_utils.h b/engine/src/gfx/cockpit_gfx_utils.h index be4ebbceb9..737936ee07 100644 --- a/engine/src/gfx/cockpit_gfx_utils.h +++ b/engine/src/gfx/cockpit_gfx_utils.h @@ -1,5 +1,4 @@ // -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- - /* * cockpit_gfx_utils.h * @@ -24,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef COCKPIT_GFX_UTILS_H -#define COCKPIT_GFX_UTILS_H - +#ifndef VEGA_STRIKE_ENGINE_GFX_COCKPIT_GFX_UTILS_H +#define VEGA_STRIKE_ENGINE_GFX_COCKPIT_GFX_UTILS_H #include "vec.h" #include "gfxlib_struct.h" @@ -57,4 +54,4 @@ VertexBuilder<> GetAnimatedLockingIcon(const QVector &location, const Vector& ca void SetThickness(ShapeType type); -#endif // COCKPIT_GFX_UTILS_H +#endif //VEGA_STRIKE_ENGINE_GFX_COCKPIT_GFX_UTILS_H diff --git a/engine/src/gfx/coord_select.h b/engine/src/gfx/coord_select.h index 004af47aa2..5f58041f26 100644 --- a/engine/src/gfx/coord_select.h +++ b/engine/src/gfx/coord_select.h @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +// NO HEADER GUARD #include "vec.h" #include "animation.h" diff --git a/engine/src/gfx/decalqueue.h b/engine/src/gfx/decalqueue.h index 596d403706..9fa9530ead 100644 --- a/engine/src/gfx/decalqueue.h +++ b/engine/src/gfx/decalqueue.h @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +// NO HEADER GUARD #include "vs_globals.h" #include "gfx/aux_texture.h" diff --git a/engine/src/gfx/env_map_gent.h b/engine/src/gfx/env_map_gent.h index 1bcd9d7d49..c381b513e2 100644 --- a/engine/src/gfx/env_map_gent.h +++ b/engine/src/gfx/env_map_gent.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _GFX_ENV_MAP_GENT_H_ -#define _GFX_ENV_MAP_GENT_H_ +#ifndef VEGA_STRIKE_ENGINE_GFX_ENV_MAP_GENT_H +#define VEGA_STRIKE_ENGINE_GFX_ENV_MAP_GENT_H void EnvironmentMapGeneratorMain(const char *inpt, const char *outpt, float a = 0, @@ -34,5 +32,4 @@ void EnvironmentMapGeneratorMain(const char *inpt, float p = 1, bool w = false); -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_ENV_MAP_GENT_H diff --git a/engine/src/gfx/gauge.h b/engine/src/gfx/gauge.h index f1a10cc8b0..9d8fb70cb1 100644 --- a/engine/src/gfx/gauge.h +++ b/engine/src/gfx/gauge.h @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +// NO HEADER GUARD #include "sprite.h" class Cockpit; diff --git a/engine/src/gfx/halo.h b/engine/src/gfx/halo.h index e7d5c2c90c..176fd2de2d 100644 --- a/engine/src/gfx/halo.h +++ b/engine/src/gfx/halo.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __HALO_H -#define __HALO_H +#ifndef VEGA_STRIKE_ENGINE_GFX_HALO_H +#define VEGA_STRIKE_ENGINE_GFX_HALO_H #include "gfxlib.h" #include "vec.h" @@ -74,5 +72,4 @@ class Halo { } }; -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_HALO_H diff --git a/engine/src/gfx/halo_system.h b/engine/src/gfx/halo_system.h index dca2eb0b07..d1f0dc7ba2 100644 --- a/engine/src/gfx/halo_system.h +++ b/engine/src/gfx/halo_system.h @@ -23,10 +23,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_GFX_HALOSYSTEM_H +#define VEGA_STRIKE_ENGINE_GFX_HALOSYSTEM_H - -#ifndef HALOSYSTEM_H_ -#define HALOSYSTEM_H_ #include <vector> #include "matrix.h" class Mesh; @@ -77,5 +76,4 @@ class HaloSystem { int faction); }; -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_HALOSYSTEM_H diff --git a/engine/src/gfx/hud.h b/engine/src/gfx/hud.h index e2c3639236..95bb35570b 100644 --- a/engine/src/gfx/hud.h +++ b/engine/src/gfx/hud.h @@ -20,10 +20,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __HUD_H -#define __HUD_H +#ifndef VEGA_STRIKE_ENGINE_GFX_HUD_H +#define VEGA_STRIKE_ENGINE_GFX_HUD_H #include <string> #include "vec.h" @@ -93,5 +91,4 @@ class TextPlane { } }; -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_HUD_H diff --git a/engine/src/gfx/jpeg_memory.cpp b/engine/src/gfx/jpeg_memory.cpp index 17f3f23894..90263dbfb3 100644 --- a/engine/src/gfx/jpeg_memory.cpp +++ b/engine/src/gfx/jpeg_memory.cpp @@ -31,7 +31,8 @@ #include <iostream> #include "vs_logging.h" -#ifdef JPEG_SUPPORT +// NOTE: There was a JPEG_SUPPORT C Macro wrapper here; however, it was always defined +// in jpeg_memory.h so removing it makes no difference. //Moved the following three functions here from the .h file /*---------------------------------------------------------------------------- @@ -257,6 +258,3 @@ void jpeg_decompress_from_file(unsigned char *dst, char *file, int size, int *w, jpeg_destroy_decompress(&cinfo); fclose(infile); } - -#endif - diff --git a/engine/src/gfx/jpeg_memory.h b/engine/src/gfx/jpeg_memory.h index 6372083c1e..bf4957f99a 100644 --- a/engine/src/gfx/jpeg_memory.h +++ b/engine/src/gfx/jpeg_memory.h @@ -24,12 +24,15 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#define JPEG_SUPPORT -#ifdef JPEG_SUPPORT /* Always true? */ -#ifndef __JPEG_MEMORY_H -#define __JPEG_MEMORY_H +// NOTE: The code use to include a C Macro definition for JPEG_SUPPORT. +// After a little investigation: +// 1. It was always defined so had no impact on this file +// 2. After a search of the engine source nothing else used it aside from jpeg_memory.cpp +// which removing it did not really effect since it was always defined any way +// Therefore it was removed so that a single explicit header guard was obvious; +// as opposed to being hidden behind a second guard. +#ifndef VEGA_STRIKE_ENGINE_GFX_JPEG_MEMORY_H +#define VEGA_STRIKE_ENGINE_GFX_JPEG_MEMORY_H #include <stdio.h> #include <string.h> @@ -103,6 +106,4 @@ extern void jpeg_memory_src(j_decompress_ptr cinfo, unsigned char *ptr, size_t s void jpeg_decompress(unsigned char *dst, unsigned char *src, int size, int *w, int *h); void jpeg_decompress_from_file(unsigned char *dst, char *file, int size, int *w, int *h); -#endif -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_JPEG_MEMORY_H diff --git a/engine/src/gfx/lerp.h b/engine/src/gfx/lerp.h index 421d4e812b..fc62909e56 100644 --- a/engine/src/gfx/lerp.h +++ b/engine/src/gfx/lerp.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _GFX_LERP_H_ -#define _GFX_LERP_H_ +#ifndef VEGA_STRIKE_ENGINE_GFX_LERP_H +#define VEGA_STRIKE_ENGINE_GFX_LERP_H #include <assert.h> #include "vec.h" @@ -40,5 +38,4 @@ inline Transformation linear_interpolate(const Transformation &a, const Transfor return linear_interpolate_uncapped(a, b, ((blend > 1.0) ? 1.0 : blend)); } -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_LERP_H diff --git a/engine/src/gfx/loc_select.h b/engine/src/gfx/loc_select.h index cda8b27a04..4aac9acc94 100644 --- a/engine/src/gfx/loc_select.h +++ b/engine/src/gfx/loc_select.h @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +// NO HEADER GUARD #include "vec.h" diff --git a/engine/src/gfx/masks.h b/engine/src/gfx/masks.h index 8487b3d6b9..68613f538a 100644 --- a/engine/src/gfx/masks.h +++ b/engine/src/gfx/masks.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _MASKS_H_ -#define _MASKS_H_ +#ifndef VEGA_STRIKE_ENGINE_GFX_MASKS_H +#define VEGA_STRIKE_ENGINE_GFX_MASKS_H bool checkbit(int &, int); void dosetbit(int &, int); @@ -34,5 +32,4 @@ void unsetbit(int &, int); void flipbit(int &, int); float Delta(float a, float b); -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_MASKS_H diff --git a/engine/src/gfx/matrix.h b/engine/src/gfx/matrix.h index 01498ba18b..0856d39b1e 100644 --- a/engine/src/gfx/matrix.h +++ b/engine/src/gfx/matrix.h @@ -23,9 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef _MATRIX_H -#define _MATRIX_H +#ifndef VEGA_STRIKE_ENGINE_GFX_MATRIX_H +#define VEGA_STRIKE_ENGINE_GFX_MATRIX_H #include "vec.h" #include "endianness.h" @@ -395,5 +394,4 @@ struct DrawContext { } }; -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_MATRIX_H diff --git a/engine/src/gfx/mesh.h b/engine/src/gfx/mesh.h index 5de887c3d3..0b71a3e045 100644 --- a/engine/src/gfx/mesh.h +++ b/engine/src/gfx/mesh.h @@ -25,10 +25,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _MESH_H_ -#define _MESH_H_ +#ifndef VEGA_STRIKE_ENGINE_GFX_MESH_H +#define VEGA_STRIKE_ENGINE_GFX_MESH_H #include <string> #include <vector> @@ -455,5 +453,4 @@ class Mesh { } }; -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_MESH_H diff --git a/engine/src/gfx/mesh_bxm.h b/engine/src/gfx/mesh_bxm.h index b648774f5a..8f112136b3 100644 --- a/engine/src/gfx/mesh_bxm.h +++ b/engine/src/gfx/mesh_bxm.h @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +// NO HEADER GUARD #include <string> #include <vector> diff --git a/engine/src/gfx/mesh_io.h b/engine/src/gfx/mesh_io.h index 0e341358f2..951fdebcb3 100644 --- a/engine/src/gfx/mesh_io.h +++ b/engine/src/gfx/mesh_io.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __MESH_IO_H__INCLUDED_ -#define __MESH_IO_H__INCLUDED_ +#ifndef VEGA_STRIKE_ENGINE_GFX_MESH_IO_H +#define VEGA_STRIKE_ENGINE_GFX_MESH_IO_H #define uint32bit unsigned int #define float32bit float @@ -64,5 +62,4 @@ enum textype { TECHNIQUE }; -#endif //__MESH_IO_H__INCLUDED_ - +#endif //VEGA_STRIKE_ENGINE_GFX_MESH_IO_H diff --git a/engine/src/gfx/mesh_xml.h b/engine/src/gfx/mesh_xml.h index fbc194ef3e..352c1eb59b 100644 --- a/engine/src/gfx/mesh_xml.h +++ b/engine/src/gfx/mesh_xml.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __MESH_XML_H__INCLUDED_ -#define __MESH_XML_H__INCLUDED_ +#ifndef VEGA_STRIKE_ENGINE_GFX_MESH_XML_H +#define VEGA_STRIKE_ENGINE_GFX_MESH_XML_H struct MeshXML { enum Names { @@ -220,6 +218,4 @@ struct MeshXML { Mesh *mesh; }; -#endif - - +#endif //VEGA_STRIKE_ENGINE_GFX_MESH_XML_H diff --git a/engine/src/gfx/nav/criteria.h b/engine/src/gfx/nav/criteria.h index 776720c0d4..76758c1bbf 100644 --- a/engine/src/gfx/nav/criteria.h +++ b/engine/src/gfx/nav/criteria.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __CRITERIA_H__ -#define __CRITERIA_H__ +#ifndef VEGA_STRIKE_ENGINE_GFX_NAV_CRITERIA_H +#define VEGA_STRIKE_ENGINE_GFX_NAV_CRITERIA_H class CriteriaParent; @@ -270,5 +268,4 @@ class CriteriaSector : public CriteriaLeaf { } }; -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_NAV_CRITERIA_H diff --git a/engine/src/gfx/nav/drawlist.h b/engine/src/gfx/nav/drawlist.h index 6b668e4c01..4addee0748 100644 --- a/engine/src/gfx/nav/drawlist.h +++ b/engine/src/gfx/nav/drawlist.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _DRAWLIST_H_ -#define _DRAWLIST_H_ +#ifndef VEGA_STRIKE_ENGINE_GFX_NAV_DRAW_LIST_H +#define VEGA_STRIKE_ENGINE_GFX_NAV_DRAW_LIST_H #include <stdlib.h> #include <string> @@ -110,5 +108,4 @@ class navdrawlist //not really a list... it inserts at head, and reads hea ~navdrawlist(); }; -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_NAV_DRAW_LIST_H diff --git a/engine/src/gfx/nav/navcomputer.h b/engine/src/gfx/nav/navcomputer.h index e75338175e..0d4c653606 100644 --- a/engine/src/gfx/nav/navcomputer.h +++ b/engine/src/gfx/nav/navcomputer.h @@ -19,10 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __NAVCOMPUTER_H__ -#define __NAVCOMPUTER_H__ +#ifndef VEGA_STRIKE_ENGINE_GFX_NAV_NAV_COMPUTER_H +#define VEGA_STRIKE_ENGINE_GFX_NAV_NAV_COMPUTER_H #include "navscreen.h" #include "navpath.h" @@ -221,5 +219,4 @@ class NavComputer : public WindowController { Control *m_selectorModeGroups[SELECTOR_MODE_COUNT]; //Array of GroupControls, one for each selector mode. }; -#endif //__NAVCOMPUTER_H__ - +#endif //VEGA_STRIKE_ENGINE_GFX_NAV_NAV_COMPUTER_H diff --git a/engine/src/gfx/nav/navgetxmldata.h b/engine/src/gfx/nav/navgetxmldata.h index d4d4c852ba..a4869e5b6e 100644 --- a/engine/src/gfx/nav/navgetxmldata.h +++ b/engine/src/gfx/nav/navgetxmldata.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _NAVGETXMLDATA_H_ -#define _NAVGETXMLDATA_H_ +#ifndef VEGA_STRIKE_ENGINE_GFX_NAV_NAV_GET_XML_DATA_H +#define VEGA_STRIKE_ENGINE_GFX_NAV_NAV_GET_XML_DATA_H #include <string> @@ -34,5 +32,4 @@ std::string retrievedata(std::string data, std::string type); -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_NAV_NAV_GET_XML_DATA_H diff --git a/engine/src/gfx/nav/navitemstodraw.h b/engine/src/gfx/nav/navitemstodraw.h index e91fc458d0..cd8eee729d 100644 --- a/engine/src/gfx/nav/navitemstodraw.h +++ b/engine/src/gfx/nav/navitemstodraw.h @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +// NO HEADER GUARD //This draws the mouse cursor //********************************** diff --git a/engine/src/gfx/nav/navitemtypes.h b/engine/src/gfx/nav/navitemtypes.h index e9ba80de60..911aa14471 100644 --- a/engine/src/gfx/nav/navitemtypes.h +++ b/engine/src/gfx/nav/navitemtypes.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _NAVITEMTYPES_H_ -#define _NAVITEMTYPES_H_ +#ifndef VEGA_STRIKE_ENGINE_GFX_NAV_NAV_ITEM_TYPES_H +#define VEGA_STRIKE_ENGINE_GFX_NAV_NAV_ITEM_TYPES_H enum NAVITEMTYPES { navsun, @@ -56,5 +54,4 @@ enum NAVITEMTYPES { #define navjumpsize 0.0125 #define navambiguoussize 0.01 -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_NAV_NAV_ITEM_TYPES_H diff --git a/engine/src/gfx/nav/navparse.h b/engine/src/gfx/nav/navparse.h index cc62bc6ef6..b7a9d38cc2 100644 --- a/engine/src/gfx/nav/navparse.h +++ b/engine/src/gfx/nav/navparse.h @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +// NO HEADER GUARD #include "vsfilesystem.h" diff --git a/engine/src/gfx/nav/navpath.h b/engine/src/gfx/nav/navpath.h index 3ea3e82a72..3b9fa72e44 100644 --- a/engine/src/gfx/nav/navpath.h +++ b/engine/src/gfx/nav/navpath.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __NAVPATH_H__ -#define __NAVPATH_H__ +#ifndef VEGA_STRIKE_ENGINE_GFX_NAV_NAV_PATH_H +#define VEGA_STRIKE_ENGINE_GFX_NAV_NAV_PATH_H #include <vector> #include <deque> @@ -427,5 +425,4 @@ class ChainPathNode : public PathNode { PartType type; }; -#endif //__NAVPATH_H__ - +#endif //VEGA_STRIKE_ENGINE_GFX_NAV_NAV_PATH_H diff --git a/engine/src/gfx/nav/navscreen.h b/engine/src/gfx/nav/navscreen.h index 6ffa131aa5..a9408bc1f4 100644 --- a/engine/src/gfx/nav/navscreen.h +++ b/engine/src/gfx/nav/navscreen.h @@ -22,10 +22,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _NAVSCREEN_H_ -#define _NAVSCREEN_H_ +#ifndef VEGA_STRIKE_ENGINE_GFX_NAV_NAV_SCREEN_H +#define VEGA_STRIKE_ENGINE_GFX_NAV_NAV_SCREEN_H #include "gui/glut_support.h" #include "navscreenoccupied.h" @@ -377,5 +375,4 @@ class NavigationSystem { //float Delta(float a, float b); }; -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_NAV_NAV_SCREEN_H diff --git a/engine/src/gfx/nav/navscreenoccupied.h b/engine/src/gfx/nav/navscreenoccupied.h index c771c10dc9..ec88fc9df4 100644 --- a/engine/src/gfx/nav/navscreenoccupied.h +++ b/engine/src/gfx/nav/navscreenoccupied.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _NAVSCREENOCCUPIED_H_ -#define _NAVSCREENOCCUPIED_H_ +#ifndef VEGA_STRIKE_ENGINE_GFX_NAV_NAV_SCREEN_OCCUPIED_H +#define VEGA_STRIKE_ENGINE_GFX_NAV_NAV_SCREEN_OCCUPIED_H //#include "masks.h" @@ -56,5 +54,5 @@ class navscreenoccupied { float findfreesector(float x, float y); float findfreefloat(int §or, float &y); }; -#endif +#endif //VEGA_STRIKE_ENGINE_GFX_NAV_NAV_SCREEN_OCCUPIED_H diff --git a/engine/src/gfx/nonlinear_transform.h b/engine/src/gfx/nonlinear_transform.h index db90296969..88583cdbbd 100644 --- a/engine/src/gfx/nonlinear_transform.h +++ b/engine/src/gfx/nonlinear_transform.h @@ -23,10 +23,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_GFX_NONLINEAR_TRANSFORM_H +#define VEGA_STRIKE_ENGINE_GFX_NONLINEAR_TRANSFORM_H - -#ifndef NONLINEAR_TRANSFORM_H_ -#define NONLINEAR_TRANSFORM_H_ #include "macosx_math.h" #include <math.h> #ifndef M_PI @@ -160,5 +159,5 @@ class SphericalTransform : public IdentityTransform { * } * }; */ -#endif +#endif //VEGA_STRIKE_ENGINE_GFX_NONLINEAR_TRANSFORM_H diff --git a/engine/src/gfx/occlusion.h b/engine/src/gfx/occlusion.h index e04c62c238..576e473649 100644 --- a/engine/src/gfx/occlusion.h +++ b/engine/src/gfx/occlusion.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _VS_OCCLUSION_H_ -#define _VS_OCCLUSION_H_ +#ifndef VEGA_STRIKE_ENGINE_GFX_OCCLUSION_H +#define VEGA_STRIKE_ENGINE_GFX_OCCLUSION_H #include "vs_globals.h" @@ -68,4 +66,4 @@ float /*GFXDRVAPI*/ testOcclusion(const QVector &lightPos, float lightSize, cons } -#endif//_VS_OCCLUSION_H_ \ No newline at end of file +#endif //VEGA_STRIKE_ENGINE_GFX_OCCLUSION_H diff --git a/engine/src/gfx/particle.h b/engine/src/gfx/particle.h index e8d520337f..2bd6bbba00 100644 --- a/engine/src/gfx/particle.h +++ b/engine/src/gfx/particle.h @@ -21,10 +21,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __PARTICLE_H -#define __PARTICLE_H +#ifndef VEGA_STRIKE_ENGINE_GFX_PARTICLE_H +#define VEGA_STRIKE_ENGINE_GFX_PARTICLE_H #include <vector> #include <string> @@ -163,5 +161,4 @@ extern ParticleTrail particleTrail; extern ParticleTrail smokeTrail; extern ParticleTrail debrisTrail; -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_PARTICLE_H diff --git a/engine/src/gfx/pass.h b/engine/src/gfx/pass.h index 452101075b..d0fb1cb330 100644 --- a/engine/src/gfx/pass.h +++ b/engine/src/gfx/pass.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef PASS_H -#define PASS_H +#ifndef VEGA_STRIKE_ENGINE_GFX_PASS_H +#define VEGA_STRIKE_ENGINE_GFX_PASS_H #include <string> #include <vector> @@ -404,4 +402,4 @@ class Pass { bool isCompiled(int programVersion) const; }; -#endif // PASS_H +#endif //VEGA_STRIKE_ENGINE_GFX_PASS_H diff --git a/engine/src/gfx/pipelined_texture.h b/engine/src/gfx/pipelined_texture.h index c51cfd9e36..940cc031f5 100644 --- a/engine/src/gfx/pipelined_texture.h +++ b/engine/src/gfx/pipelined_texture.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __PIPELINED_TEXTURE_H__INCLUDED_ -#define __PIPELINED_TEXTURE_H__INCLUDED_ +#ifndef VEGA_STRIKE_ENGINE_GFX_PIPELINED_TEXTURE_H +#define VEGA_STRIKE_ENGINE_GFX_PIPELINED_TEXTURE_H #include "aux_texture.h" @@ -57,5 +55,4 @@ class PipelinedTexture : public Texture { void MakeLastActive(); }; -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_PIPELINED_TEXTURE_H diff --git a/engine/src/gfx/point_to_cam.h b/engine/src/gfx/point_to_cam.h index cdf533a39d..032bdfe04b 100644 --- a/engine/src/gfx/point_to_cam.h +++ b/engine/src/gfx/point_to_cam.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _POINT_TO_CAM_H_ -#define _POINT_TO_CAM_H_ +#ifndef VEGA_STRIKE_ENGINE_GFX_POINT_TO_CAM_H +#define VEGA_STRIKE_ENGINE_GFX_POINT_TO_CAM_H /** * Calculates the way a point-like sphere should be oriented, with a given @@ -95,5 +93,4 @@ inline bool CalculateOrientation(QVector &Pos, return offz < .4 * g_game.zfar; } -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_POINT_TO_CAM_H diff --git a/engine/src/gfx/quadsquare.h b/engine/src/gfx/quadsquare.h index 39e2800ae0..d21b377921 100644 --- a/engine/src/gfx/quadsquare.h +++ b/engine/src/gfx/quadsquare.h @@ -19,10 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef QUADSQUARE_H -#define QUADSQUARE_H +#ifndef VEGA_STRIKE_ENGINE_GFX_QUAD_SQUARE_H +#define VEGA_STRIKE_ENGINE_GFX_QUAD_SQUARE_H /** * @@ -201,5 +199,4 @@ class quadsquare { static quadsquare *neighbor[4]; }; -#endif //QUADSQUARE_H - +#endif //VEGA_STRIKE_ENGINE_GFX_QUAD_SQUARE_H diff --git a/engine/src/gfx/quadtree.h b/engine/src/gfx/quadtree.h index af475c175c..c5e4020d27 100644 --- a/engine/src/gfx/quadtree.h +++ b/engine/src/gfx/quadtree.h @@ -23,10 +23,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_GFX_QUADTREE_H +#define VEGA_STRIKE_ENGINE_GFX_QUADTREE_H - -#ifndef QUADTREE_H_ -#define QUADTREE_H_ #include "quadsquare.h" #include "xml_support.h" #include "matrix.h" @@ -118,5 +117,4 @@ class QuadTree { Vector GetNormal(const Vector &position, const Vector &requestednorm) const; }; -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_QUADTREE_H diff --git a/engine/src/gfx/quaternion.h b/engine/src/gfx/quaternion.h index d5305ffd70..2378f0849d 100644 --- a/engine/src/gfx/quaternion.h +++ b/engine/src/gfx/quaternion.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _QUATERNION_H_ -#define _QUATERNION_H_ +#ifndef VEGA_STRIKE_ENGINE_GFX_QUATERNION_H +#define VEGA_STRIKE_ENGINE_GFX_QUATERNION_H #include "vec.h" #include "matrix.h" @@ -179,5 +177,4 @@ struct Transformation { const Transformation identity_transformation(identity_quaternion, QVector(0, 0, 0)); -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_QUATERNION_H diff --git a/engine/src/gfx/radar/bubble_display.h b/engine/src/gfx/radar/bubble_display.h index 96554bc4e3..ded6f73d82 100644 --- a/engine/src/gfx/radar/bubble_display.h +++ b/engine/src/gfx/radar/bubble_display.h @@ -1,5 +1,4 @@ // -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- - /** * bubble_display.h * @@ -25,10 +24,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef VEGASTRIKE_GFX_RADAR_BUBBLE_DISPLAY_H -#define VEGASTRIKE_GFX_RADAR_BUBBLE_DISPLAY_H +#ifndef VEGA_STRIKE_ENGINE_GFX_RADAR_BUBBLE_DISPLAY_H +#define VEGA_STRIKE_ENGINE_GFX_RADAR_BUBBLE_DISPLAY_H #include <queue> #include "sensor.h" @@ -88,4 +85,4 @@ class BubbleDisplay : public DualDisplayBase { } // namespace Radar -#endif +#endif //VEGA_STRIKE_ENGINE_GFX_RADAR_BUBBLE_DISPLAY_H diff --git a/engine/src/gfx/radar/dual_display.h b/engine/src/gfx/radar/dual_display.h index 6d60d10ef9..78113eb02c 100644 --- a/engine/src/gfx/radar/dual_display.h +++ b/engine/src/gfx/radar/dual_display.h @@ -1,5 +1,4 @@ // -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- - /** * dual_display.h * @@ -25,10 +24,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef VEGASTRIKE_GFX_RADAR_DUALDISPLAY_H -#define VEGASTRIKE_GFX_RADAR_DUALDISPLAY_H +#ifndef VEGA_STRIKE_ENGINE_GFX_RADAR_DUALDISPLAY_H +#define VEGA_STRIKE_ENGINE_GFX_RADAR_DUALDISPLAY_H #include <boost/random.hpp> @@ -68,4 +65,4 @@ class DualDisplayBase : public Display { } // namespace Radar -#endif +#endif //VEGA_STRIKE_ENGINE_GFX_RADAR_DUALDISPLAY_H diff --git a/engine/src/gfx/radar/null_display.h b/engine/src/gfx/radar/null_display.h index 6b5610da14..a298fcf7ef 100644 --- a/engine/src/gfx/radar/null_display.h +++ b/engine/src/gfx/radar/null_display.h @@ -1,5 +1,4 @@ // -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- - /** * null_display.h * @@ -25,10 +24,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef VEGASTRIKE_GFX_RADAR_NULL_DISPLAY_H -#define VEGASTRIKE_GFX_RADAR_NULL_DISPLAY_H +#ifndef VEGA_STRIKE_ENGINE_GFX_RADAR_NULL_DISPLAY_H +#define VEGA_STRIKE_ENGINE_GFX_RADAR_NULL_DISPLAY_H #include "radar.h" @@ -43,4 +40,4 @@ class NullDisplay : public Display { } // namespace Radar -#endif +#endif //VEGA_STRIKE_ENGINE_GFX_RADAR_NULL_DISPLAY_H diff --git a/engine/src/gfx/radar/plane_display.h b/engine/src/gfx/radar/plane_display.h index f7b36b757b..ba348cd0de 100644 --- a/engine/src/gfx/radar/plane_display.h +++ b/engine/src/gfx/radar/plane_display.h @@ -1,5 +1,4 @@ // -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- - /** * plane_display.h * @@ -25,10 +24,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef VEGASTRIKE_GFX_RADAR_PLANE_DISPLAY_H -#define VEGASTRIKE_GFX_RADAR_PLANE_DISPLAY_H +#ifndef VEGA_STRIKE_ENGINE_GFX_RADAR_PLANE_DISPLAY_H +#define VEGA_STRIKE_ENGINE_GFX_RADAR_PLANE_DISPLAY_H #include <vector> #include <queue> @@ -101,4 +98,4 @@ class PlaneDisplay : public DualDisplayBase { } // namespace Radar -#endif +#endif //VEGA_STRIKE_ENGINE_GFX_RADAR_PLANE_DISPLAY_H diff --git a/engine/src/gfx/radar/radar.h b/engine/src/gfx/radar/radar.h index e8f92b69d1..b787ed3fe1 100644 --- a/engine/src/gfx/radar/radar.h +++ b/engine/src/gfx/radar/radar.h @@ -1,5 +1,4 @@ // -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- - /** * radar.h * @@ -25,10 +24,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef VEGASTRIKE_GFX_RADAR_RADAR_H -#define VEGASTRIKE_GFX_RADAR_RADAR_H +#ifndef VEGA_STRIKE_ENGINE_GFX_RADAR_RADAR_H +#define VEGA_STRIKE_ENGINE_GFX_RADAR_RADAR_H #include <string> #include <vector> @@ -78,4 +75,4 @@ std::unique_ptr<Display> Factory(Type::Value); } // namespace Radar -#endif +#endif //VEGA_STRIKE_ENGINE_GFX_RADAR_RADAR_H diff --git a/engine/src/gfx/radar/sensor.h b/engine/src/gfx/radar/sensor.h index 350c0e5852..0fe7a08633 100644 --- a/engine/src/gfx/radar/sensor.h +++ b/engine/src/gfx/radar/sensor.h @@ -27,8 +27,8 @@ */ -#ifndef VEGASTRIKE_GFX_RADAR_SENSOR_H -#define VEGASTRIKE_GFX_RADAR_SENSOR_H +#ifndef VEGA_STRIKE_ENGINE_GFX_RADAR_SENSOR_H +#define VEGA_STRIKE_ENGINE_GFX_RADAR_SENSOR_H #include <vector> #include "track.h" @@ -101,4 +101,4 @@ class Sensor { } // namespace Radar -#endif +#endif //VEGA_STRIKE_ENGINE_GFX_RADAR_SENSOR_H diff --git a/engine/src/gfx/radar/sphere_display.h b/engine/src/gfx/radar/sphere_display.h index 427853cac3..a52384bd8d 100644 --- a/engine/src/gfx/radar/sphere_display.h +++ b/engine/src/gfx/radar/sphere_display.h @@ -1,5 +1,4 @@ // -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- - /** * sphere_display.h * @@ -25,10 +24,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef VEGASTRIKE_GFX_RADAR_SPHERE_DISPLAY_H -#define VEGASTRIKE_GFX_RADAR_SPHERE_DISPLAY_H +#ifndef VEGA_STRIKE_ENGINE_GFX_RADAR_SPHERE_DISPLAY_H +#define VEGA_STRIKE_ENGINE_GFX_RADAR_SPHERE_DISPLAY_H #include "sensor.h" #include "radar.h" @@ -65,4 +62,4 @@ class SphereDisplay : public DualDisplayBase { } // namespace Radar -#endif +#endif //VEGA_STRIKE_ENGINE_GFX_RADAR_SPHERE_DISPLAY_H diff --git a/engine/src/gfx/radar/track.h b/engine/src/gfx/radar/track.h index 5b234996cf..220610fb91 100644 --- a/engine/src/gfx/radar/track.h +++ b/engine/src/gfx/radar/track.h @@ -1,5 +1,4 @@ // -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- - /** * track.h * @@ -25,10 +24,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef VEGASTRIKE_GFX_RADAR_TRACK_H -#define VEGASTRIKE_GFX_RADAR_TRACK_H +#ifndef VEGA_STRIKE_ENGINE_GFX_RADAR_TRACK_H +#define VEGA_STRIKE_ENGINE_GFX_RADAR_TRACK_H #include "gfx/vec.h" @@ -116,4 +113,4 @@ class Track { } // namespace Radar -#endif +#endif //VEGA_STRIKE_ENGINE_GFX_RADAR_TRACK_H diff --git a/engine/src/gfx/radar/viewarea.h b/engine/src/gfx/radar/viewarea.h index ee4567dabe..f0b1190c78 100644 --- a/engine/src/gfx/radar/viewarea.h +++ b/engine/src/gfx/radar/viewarea.h @@ -1,5 +1,4 @@ // -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- - /** * viewarea.h * @@ -25,10 +24,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef VEGASTRIKE_GFX_RADAR_VIEWAREA_H -#define VEGASTRIKE_GFX_RADAR_VIEWAREA_H +#ifndef VEGA_STRIKE_ENGINE_GFX_RADAR_VIEWAREA_H +#define VEGA_STRIKE_ENGINE_GFX_RADAR_VIEWAREA_H #include "gfx/vec.h" #include "gfx/sprite.h" @@ -55,4 +52,4 @@ struct ViewArea { } // namespace Radar -#endif +#endif //VEGA_STRIKE_ENGINE_GFX_RADAR_VIEWAREA_H diff --git a/engine/src/gfx/ring.h b/engine/src/gfx/ring.h index dec2912737..1d70264838 100644 --- a/engine/src/gfx/ring.h +++ b/engine/src/gfx/ring.h @@ -23,10 +23,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_GFX_RING_H +#define VEGA_STRIKE_ENGINE_GFX_RING_H - -#ifndef _RING_H_ -#define _RING_H_ #include "mesh.h" #include "vegastrike.h" @@ -86,5 +85,5 @@ class RingMesh : public Mesh { virtual float clipRadialSize() const; }; -#endif +#endif //VEGA_STRIKE_ENGINE_GFX_RING_H diff --git a/engine/src/gfx/screenshot.h b/engine/src/gfx/screenshot.h index e540be841f..6f29d7d032 100644 --- a/engine/src/gfx/screenshot.h +++ b/engine/src/gfx/screenshot.h @@ -23,12 +23,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __SCREENSHOT_H__INCLUDED_ -#define __SCREENSHOT_H__INCLUDED_ +#ifndef VEGA_STRIKE_ENGINE_GFX_SCREENSHOT_H +#define VEGA_STRIKE_ENGINE_GFX_SCREENSHOT_H void Screenshot(const KBData &, KBSTATE); -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_SCREENSHOT_H diff --git a/engine/src/gfx/soundcontainer.h b/engine/src/gfx/soundcontainer.h index 430b068e6c..3a884b11c3 100644 --- a/engine/src/gfx/soundcontainer.h +++ b/engine/src/gfx/soundcontainer.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _SOUNDCONTAINER_H_ -#define _SOUNDCONTAINER_H_ +#ifndef VEGA_STRIKE_ENGINE_GFX_SOUND_CONTAINER_H +#define VEGA_STRIKE_ENGINE_GFX_SOUND_CONTAINER_H #include <string> @@ -110,5 +108,4 @@ class GameSoundContainer : public SoundContainer { }; -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_SOUND_CONTAINER_H diff --git a/engine/src/gfx/soundcontainer_aldrv.h b/engine/src/gfx/soundcontainer_aldrv.h index 69aa1d1441..39a2a55c12 100644 --- a/engine/src/gfx/soundcontainer_aldrv.h +++ b/engine/src/gfx/soundcontainer_aldrv.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _SOUNDCONTAINER_ALDRV_H_ -#define _SOUNDCONTAINER_ALDRV_H_ +#ifndef VEGA_STRIKE_ENGINE_GFX_SOUND_CONTAINER_ALDRV_H +#define VEGA_STRIKE_ENGINE_GFX_SOUND_CONTAINER_ALDRV_H #include <string> @@ -57,5 +55,4 @@ class AldrvSoundContainer : public GameSoundContainer { virtual bool isPlayingImpl() const; }; -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_SOUND_CONTAINER_ALDRV_H diff --git a/engine/src/gfx/soundcontainer_generic.h b/engine/src/gfx/soundcontainer_generic.h index aa56a3fa59..3553a332fc 100644 --- a/engine/src/gfx/soundcontainer_generic.h +++ b/engine/src/gfx/soundcontainer_generic.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _SOUNDCONTAINER_GENERIC_H_ -#define _SOUNDCONTAINER_GENERIC_H_ +#ifndef VEGA_STRIKE_ENGINE_GFX_SOUND_CONTAINER_GENERIC_H +#define VEGA_STRIKE_ENGINE_GFX_SOUND_CONTAINER_GENERIC_H #include <string> @@ -70,5 +68,4 @@ class SoundContainer { virtual ~SoundContainer(); }; -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_SOUND_CONTAINER_GENERIC_H diff --git a/engine/src/gfx/sphere.h b/engine/src/gfx/sphere.h index 64900424fd..362d9aa282 100644 --- a/engine/src/gfx/sphere.h +++ b/engine/src/gfx/sphere.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _GFX_SPHERE_H_ -#define _GFX_SPHERE_H_ +#ifndef VEGA_STRIKE_ENGINE_GFX_SPHERE_H +#define VEGA_STRIKE_ENGINE_GFX_SPHERE_H #include "mesh.h" #include "quaternion.h" @@ -150,5 +148,5 @@ class CityLights : public SphereMesh { bool inside_out = true); virtual void ProcessDrawQueue(int whichpass, int which, bool zsort, const QVector &sortctr); }; -#endif +#endif //VEGA_STRIKE_ENGINE_GFX_SPHERE_H diff --git a/engine/src/gfx/sprite.h b/engine/src/gfx/sprite.h index 76c1bd9e80..399caae758 100644 --- a/engine/src/gfx/sprite.h +++ b/engine/src/gfx/sprite.h @@ -20,10 +20,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef SPRITE_H -#define SPRITE_H +#ifndef VEGA_STRIKE_ENGINE_GFX_SPRITE_H +#define VEGA_STRIKE_ENGINE_GFX_SPRITE_H #include "gfxlib.h" @@ -114,5 +112,4 @@ class VSSprite { } }; -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_SPRITE_H diff --git a/engine/src/gfx/star.h b/engine/src/gfx/star.h index b2b493234a..e5ce8b17ca 100644 --- a/engine/src/gfx/star.h +++ b/engine/src/gfx/star.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _STAR_H_ -#define _STAR_H_ +#ifndef VEGA_STRIKE_ENGINE_GFX_STAR_H +#define VEGA_STRIKE_ENGINE_GFX_STAR_H #include "gfxlib.h" #include "gfxlib_struct.h" @@ -128,5 +126,5 @@ class Stars { void Draw(); ~Stars(); }; -#endif +#endif //VEGA_STRIKE_ENGINE_GFX_STAR_H diff --git a/engine/src/gfx/stream_texture.h b/engine/src/gfx/stream_texture.h index c87891adf8..95b81eebbd 100644 --- a/engine/src/gfx/stream_texture.h +++ b/engine/src/gfx/stream_texture.h @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +// NO HEADER GUARD #include "aux_texture.h" diff --git a/engine/src/gfx/technique.h b/engine/src/gfx/technique.h index 7fb8fd8428..1c294bd8f7 100644 --- a/engine/src/gfx/technique.h +++ b/engine/src/gfx/technique.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __TECHNIQUE_H__INCLUDED__ -#define __TECHNIQUE_H__INCLUDED__ +#ifndef VEGA_STRIKE_ENGINE_GFX_TECHNIQUE_H +#define VEGA_STRIKE_ENGINE_GFX_TECHNIQUE_H #include "pass.h" @@ -104,5 +102,4 @@ class Technique { static TechniquePtr getTechnique(const string &name); }; -#endif //__TECHNIQUE_H__INCLUDED__ - +#endif //VEGA_STRIKE_ENGINE_GFX_TECHNIQUE_H diff --git a/engine/src/gfx/texture_manager.h b/engine/src/gfx/texture_manager.h index 6743e51feb..c3f98ac517 100644 --- a/engine/src/gfx/texture_manager.h +++ b/engine/src/gfx/texture_manager.h @@ -21,10 +21,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef TEXTUREMANAGER_H -#define TEXTUREMANAGER_H +#ifndef VEGA_STRIKE_ENGINE_GFX_TEXTURE_MANAGER_H +#define VEGA_STRIKE_ENGINE_GFX_TEXTURE_MANAGER_H #include <vector> @@ -39,4 +37,4 @@ class TextureManager { Texture *GetTexture(std::string const &name, enum FILTER mipmap); }; -#endif // TEXTUREMANAGER_H +#endif //VEGA_STRIKE_ENGINE_GFX_TEXTURE_MANAGER_H diff --git a/engine/src/gfx/tvector.h b/engine/src/gfx/tvector.h index 2dfd571877..b844cefc9c 100644 --- a/engine/src/gfx/tvector.h +++ b/engine/src/gfx/tvector.h @@ -19,10 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef TVECTOR_H -#define TVECTOR_H +#ifndef VEGA_STRIKE_ENGINE_GFX_TVECTOR_H +#define VEGA_STRIKE_ENGINE_GFX_TVECTOR_H #ifdef __cplusplus @@ -196,4 +194,5 @@ typedef TVector<float, double> Vector; typedef TVector<double, float> QVector; #endif // C++ -#endif // TVECTOR_H + +#endif //VEGA_STRIKE_ENGINE_GFX_TVECTOR_H diff --git a/engine/src/gfx/vdu.h b/engine/src/gfx/vdu.h index f0e6a71fc3..eddb756cdb 100644 --- a/engine/src/gfx/vdu.h +++ b/engine/src/gfx/vdu.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _GFX_VDU_H_ -#define _GFX_VDU_H_ +#ifndef VEGA_STRIKE_ENGINE_GFX_VDU_H +#define VEGA_STRIKE_ENGINE_GFX_VDU_H #include "cmd/unit_generic.h" #include "sprite.h" @@ -141,5 +139,5 @@ class VDU : public VSSprite { int parse_vdu_type(const char *s); GFXColor MountColor(Mount *mnt); -#endif +#endif //VEGA_STRIKE_ENGINE_GFX_VDU_H diff --git a/engine/src/gfx/vec.h b/engine/src/gfx/vec.h index ef07e18c39..1afc807f94 100644 --- a/engine/src/gfx/vec.h +++ b/engine/src/gfx/vec.h @@ -25,10 +25,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_GFX_VEC_H +#define VEGA_STRIKE_ENGINE_GFX_VEC_H - -#ifndef _3DMANIP_H_ -#define _3DMANIP_H_ #include "macosx_math.h" #include <math.h> @@ -36,5 +35,4 @@ #include "tvector.h" -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_VEC_H diff --git a/engine/src/gfx/vectorizable.h b/engine/src/gfx/vectorizable.h index 18be2f7e78..bc08b63bc9 100644 --- a/engine/src/gfx/vectorizable.h +++ b/engine/src/gfx/vectorizable.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __VECTORIZABLE_H -#define __VECTORIZABLE_H +#ifndef VEGA_STRIKE_ENGINE_GFX_VECTORIZABLE_H +#define VEGA_STRIKE_ENGINE_GFX_VECTORIZABLE_H #include <boost/static_assert.hpp> @@ -281,5 +279,4 @@ class vectorizable_traits<std::vector<T, A> > { } }; -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_VECTORIZABLE_H diff --git a/engine/src/gfx/vertex.h b/engine/src/gfx/vertex.h index 9e4258ec59..5c072eaeb2 100644 --- a/engine/src/gfx/vertex.h +++ b/engine/src/gfx/vertex.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef GFXVERTEX_H -#define GFXVERTEX_H +#ifndef VEGA_STRIKE_ENGINE_GFX_VERTEX_H +#define VEGA_STRIKE_ENGINE_GFX_VERTEX_H struct glVertex { float s; @@ -59,5 +57,4 @@ struct glVertex { } }; -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_VERTEX_H diff --git a/engine/src/gfx/vid_file.h b/engine/src/gfx/vid_file.h index d7b6044935..723b1f47df 100644 --- a/engine/src/gfx/vid_file.h +++ b/engine/src/gfx/vid_file.h @@ -23,13 +23,11 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - +#ifndef VEGA_STRIKE_ENGINE_GFX_VID_FILE_H +#define VEGA_STRIKE_ENGINE_GFX_VID_FILE_H // //C++ Interface: vid_file // -#ifndef __VID_FILE_H__INCLUDED__ -#define __VID_FILE_H__INCLUDED__ #include <string> #include <vsfilesystem.h> @@ -136,5 +134,4 @@ class VidFile { VidFileImpl *impl; }; -#endif //__VID_FILE_H__INCLUDED__ - +#endif //VEGA_STRIKE_ENGINE_GFX_VID_FILE_H diff --git a/engine/src/gfx/vsbox.h b/engine/src/gfx/vsbox.h index b37670dfe4..987793438f 100644 --- a/engine/src/gfx/vsbox.h +++ b/engine/src/gfx/vsbox.h @@ -23,10 +23,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _GFX_BOX_H_ -#define _GFX_BOX_H_ +#ifndef VEGA_STRIKE_ENGINE_GFX_BOX_H +#define VEGA_STRIKE_ENGINE_GFX_BOX_H #include "mesh.h" @@ -38,5 +36,4 @@ class Box : public Mesh { void ProcessDrawQueue(int whichdrawqueue); }; -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_BOX_H diff --git a/engine/src/gfx/vsimage.h b/engine/src/gfx/vsimage.h index 02e95629e3..ffeb8c1fde 100644 --- a/engine/src/gfx/vsimage.h +++ b/engine/src/gfx/vsimage.h @@ -20,10 +20,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __VSIMAGE__H -#define __VSIMAGE__H +#ifndef VEGA_STRIKE_ENGINE_GFX_VSIMAGE_H +#define VEGA_STRIKE_ENGINE_GFX_VSIMAGE_H #include "vsfilesystem.h" @@ -300,5 +298,4 @@ class VSImage { } }; -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_VSIMAGE_H diff --git a/engine/src/gfx/warptrail.h b/engine/src/gfx/warptrail.h index 95a7cfe993..24ffa62d22 100644 --- a/engine/src/gfx/warptrail.h +++ b/engine/src/gfx/warptrail.h @@ -23,13 +23,10 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __WARPTRAIL_H__INCLUDED_ -#define __WARPTRAIL_H__INCLUDED_ +#ifndef VEGA_STRIKE_ENGINE_GFX_WARP_TRAIL_H +#define VEGA_STRIKE_ENGINE_GFX_WARP_TRAIL_H void AddWarp(Unit *un, QVector beg, float tim); void WarpTrailDraw(); -#endif - +#endif //VEGA_STRIKE_ENGINE_GFX_WARP_TRAIL_H diff --git a/engine/src/gfxlib.h b/engine/src/gfxlib.h index f30b078a31..6678a80f69 100644 --- a/engine/src/gfxlib.h +++ b/engine/src/gfxlib.h @@ -19,25 +19,29 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_GFXLIB_H +#define VEGA_STRIKE_ENGINE_GFXLIB_H -#ifndef _GFXLIB_H -#define _GFXLIB_H #if defined (_WIN32) && !defined (__CYGWIN__) #ifdef GLDRV_EXPORTS #define GFXDRVAPI __declspec( dllexport ) -#else +#else //GLDRV_EXPORTS #define GFXDRVAPI __declspec( dllimport ) -#endif -#else +#endif //GLDRV_EXPORTS +#else //defined (_WIN32) && !defined (__CYGWIN__) #define GFXDRVAPI -#endif -/*#if 0 +#endif //defined (_WIN32) && !defined (__CYGWIN__) + +/* + * #if 0 * #if defined(__APPLE__) || defined(MACOSX) * #include <GLUT/glut.h> * #else * #include <GL/glut.h> * #endif - #endif*/ + * #endif + */ + #include <cstddef> #include <vector> class Matrix; @@ -525,5 +529,5 @@ void GFXUploadLightState(int max_light_location, vector<int>::const_iterator end); bool GFXShaderReloaded(); int GFXGetProgramVersion(); -#endif +#endif //VEGA_STRIKE_ENGINE_GFXLIB_H diff --git a/engine/src/gfxlib_struct.h b/engine/src/gfxlib_struct.h index 82dfeacdb0..ea06fe84bc 100644 --- a/engine/src/gfxlib_struct.h +++ b/engine/src/gfxlib_struct.h @@ -19,10 +19,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_GFXLIB_STRUCT_H +#define VEGA_STRIKE_ENGINE_GFXLIB_STRUCT_H - -#ifndef _GFXLIB_STRUCT -#define _GFXLIB_STRUCT #include "gfx/vec.h" #include "endianness.h" @@ -32,7 +31,8 @@ #ifndef GFXBOOL #define GFXBOOL unsigned char -#endif +#endif //GFXBOOL + #define GFXTRUE 1 #define GFXFALSE 0 @@ -1319,5 +1319,4 @@ struct PickData { } }; -#endif - +#endif //VEGA_STRIKE_ENGINE_GFXLIB_STRUCT_H diff --git a/engine/src/gldrv/gl_globals.h b/engine/src/gldrv/gl_globals.h index d83bc7a49f..6b58e25ca3 100644 --- a/engine/src/gldrv/gl_globals.h +++ b/engine/src/gldrv/gl_globals.h @@ -19,9 +19,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_GLDRV_GL_GLOBALS_H +#define VEGA_STRIKE_ENGINE_GLDRV_GL_GLOBALS_H -#ifndef _GL_GLOBALS_H_ -#define _GL_GLOBALS_H_ #include <queue> const static bool GFX_BUFFER_MAP_UNMAP = false; /* Hack for multitexture on Mac, here and in gl_init, ifdefined - griff */ @@ -237,7 +237,6 @@ extern int gl_batches_this_frame; //Maximum number of things that can be returned in a pick operation #define MAX_PICK 2048 #define GFX_SCALE 1./1024. -#endif // Not all platforms define GL_TEXTURE_CUBE_MAP_EXT and friends // Some platforms define _ARB variants, @@ -260,19 +259,20 @@ extern int gl_batches_this_frame; # define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB # define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB # define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB -# endif -# endif -#endif +# endif //GL_TEXTURE_CUBE_MAP_ARB +# endif //GL_TEXTURE_CUBE_MAP +#endif //GL_TEXTURE_CUBE_MAP_EXT #ifndef GL_TEXTURE_RECTANGLE_ARB # define GL_TEXTURE_RECTANGLE_ARB 0x84F5 # define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8 -#endif +#endif //GL_TEXTURE_RECTANGLE_ARB // Not all platforms define GL_FRAMEBUFFER_SRGB stuff #ifndef GL_FRAMEBUFFER_SRGB_EXT # define GL_FRAMEBUFFER_SRGB_EXT 0x8DB9 # define GL_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x8DBA -#endif +#endif //GL_FRAMEBUFFER_SRGB_EXT +#endif //VEGA_STRIKE_ENGINE_GLDRV_GL_GLOBALS_H diff --git a/engine/src/gldrv/gl_include.h b/engine/src/gldrv/gl_include.h index 8e0e013f66..5b170cfea2 100644 --- a/engine/src/gldrv/gl_include.h +++ b/engine/src/gldrv/gl_include.h @@ -20,13 +20,13 @@ * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ -#ifndef _GL_INCLUDE_H_ -#define _GL_INCLUDE_H_ +#ifndef VEGA_STRIKE_ENGINE_GLDRV_GL_INCLUDE_H +#define VEGA_STRIKE_ENGINE_GLDRV_GL_INCLUDE_H + #if defined (__APPLE__) || defined (MACOSX) # include <GLUT/glut.h> #else # include <GL/glut.h> #endif -#endif - +#endif //VEGA_STRIKE_ENGINE_GLDRV_GL_INCLUDE_H diff --git a/engine/src/gldrv/gl_init.h b/engine/src/gldrv/gl_init.h index d8ffcc2200..2ae40da9a0 100644 --- a/engine/src/gldrv/gl_init.h +++ b/engine/src/gldrv/gl_init.h @@ -22,16 +22,14 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_GLDRV_GL_INIT_H +#define VEGA_STRIKE_ENGINE_GLDRV_GL_INIT_H #ifdef __cplusplus extern "C" { #endif -#ifndef _GL_INIT_H_ -#define _GL_INIT_H_ - //#include "vegastrike.h" /* Hack to fix compiling problem with old gl.h's, reported by Steve @@ -84,5 +82,5 @@ extern PFNGLUNLOCKARRAYSEXTPROC glUnlockArraysEXT_p; #ifdef __cplusplus } /* extern "C" */ #endif -#endif +#endif //VEGA_STRIKE_ENGINE_GLDRV_GL_INIT_H diff --git a/engine/src/gldrv/gl_light.h b/engine/src/gldrv/gl_light.h index 7d2564792a..d649236796 100644 --- a/engine/src/gldrv/gl_light.h +++ b/engine/src/gldrv/gl_light.h @@ -19,9 +19,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_GLDRV_GL_LIGHT_H +#define VEGA_STRIKE_ENGINE_GLDRV_GL_LIGHT_H -#ifndef _GL_LIGHT_H_ -#define _GL_LIGHT_H_ #include "gfxlib.h" #include "hashtable_3d.h" #include "gl_globals.h" @@ -195,5 +195,4 @@ extern float intensity_cutoff; extern float optintense; extern float optsat; -#endif - +#endif //VEGA_STRIKE_ENGINE_GLDRV_GL_LIGHT_H diff --git a/engine/src/gldrv/gl_matrix.h b/engine/src/gldrv/gl_matrix.h index cfe780d08d..e08861ab35 100644 --- a/engine/src/gldrv/gl_matrix.h +++ b/engine/src/gldrv/gl_matrix.h @@ -19,6 +19,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +// NO HEADER GUARD namespace GFXMatrices { extern Matrix model, view; diff --git a/engine/src/gldrv/gl_undefined_extensions.h b/engine/src/gldrv/gl_undefined_extensions.h index 36e562ba60..8a236cbff5 100644 --- a/engine/src/gldrv/gl_undefined_extensions.h +++ b/engine/src/gldrv/gl_undefined_extensions.h @@ -22,6 +22,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +// NO HEADER GUARD #undef GL_ARB_depth_texture #undef GL_ARB_fragment_program diff --git a/engine/src/gldrv/glx_undefined_extensions.h b/engine/src/gldrv/glx_undefined_extensions.h index a220a49bc5..cb7551b759 100644 --- a/engine/src/gldrv/glx_undefined_extensions.h +++ b/engine/src/gldrv/glx_undefined_extensions.h @@ -22,6 +22,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +// NO HEADER GUARD #undef GLX_SGIX_pbuffer #undef GLX_SGIX_fbconfig diff --git a/engine/src/gldrv/hashtable_3d.h b/engine/src/gldrv/hashtable_3d.h index 8f3d4f0430..150712212e 100644 --- a/engine/src/gldrv/hashtable_3d.h +++ b/engine/src/gldrv/hashtable_3d.h @@ -19,10 +19,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_GLDRV_HASHTABLE_3D_H +#define VEGA_STRIKE_ENGINE_GLDRV_HASHTABLE_3D_H - -#ifndef _HASHTABLE_3D_H_ -#define _HASHTABLE_3D_H_ #include "gfx/vec.h" #include <algorithm> #include <vector> @@ -253,5 +252,4 @@ class Hashtable3d { } }; -#endif - +#endif //VEGA_STRIKE_ENGINE_GLDRV_HASHTABLE_3D_H diff --git a/engine/src/gldrv/sdds.h b/engine/src/gldrv/sdds.h index ed74778a98..459ae9b331 100644 --- a/engine/src/gldrv/sdds.h +++ b/engine/src/gldrv/sdds.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef _SDDS_H_ -#define _SDDS_H_ +#ifndef VEGA_STRIKE_ENGINE_GLDRV_SDDS_H +#define VEGA_STRIKE_ENGINE_GLDRV_SDDS_H #include "gfxlib_struct.h" /* @@ -37,5 +36,4 @@ void ddsDecompress(unsigned char *&input, unsigned char *&output, TEXTUREFORMAT format, int height, int width); -#endif - +#endif //VEGA_STRIKE_ENGINE_GLDRV_SDDS_H diff --git a/engine/src/gldrv/winsys.h b/engine/src/gldrv/winsys.h index 1f3a418bd9..5a95bb3b36 100644 --- a/engine/src/gldrv/winsys.h +++ b/engine/src/gldrv/winsys.h @@ -36,9 +36,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef WINSYS_H +#ifndef VEGA_STRIKE_ENGINE_GLDRV_WINSYS_H +#define VEGA_STRIKE_ENGINE_GLDRV_WINSYS_H #define WINSYS_H 1 #ifndef UCHAR_MAX #define UCHAR_MAX 255 @@ -352,7 +351,7 @@ void winsys_exit(int code); } /* extern "C" */ #endif -#endif /* WINSYS_H */ +#endif //VEGA_STRIKE_ENGINE_GLDRV_WINSYS_H /* Emacs Customizations ;;; Local Variables: *** diff --git a/engine/src/gnuhash.h b/engine/src/gnuhash.h index e37f25e0c6..c56e74adca 100644 --- a/engine/src/gnuhash.h +++ b/engine/src/gnuhash.h @@ -19,9 +19,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_GNUHASH_H +#define VEGA_STRIKE_ENGINE_GNUHASH_H -#ifndef VEGA_STRIKE_GNUHASH_H_ -#define VEGA_STRIKE_GNUHASH_H_ #include <unordered_map> #include <cstddef> @@ -81,5 +81,5 @@ class hash_compare { } -#endif //VEGA_STRIKE_GNUHASH_H_ +#endif //VEGA_STRIKE_ENGINE_GNUHASH_H diff --git a/engine/src/gui/button.h b/engine/src/gui/button.h index 11795a90d1..08c72f9673 100644 --- a/engine/src/gui/button.h +++ b/engine/src/gui/button.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef GUI_BUTTON_H -#define GUI_BUTTON_H +#ifndef VEGA_STRIKE_ENGINE_GUI_BUTTON_H +#define VEGA_STRIKE_ENGINE_GUI_BUTTON_H //Version: 1.0 - Initial Release (Feb 18, 2002) @@ -72,5 +71,4 @@ class Button { int Inside(float x, float y); }; -#endif //GUI_BUTTON_H - +#endif //VEGA_STRIKE_ENGINE_GUI_BUTTON_H diff --git a/engine/src/gui/control.h b/engine/src/gui/control.h index 32360b6e2f..1ddd31f355 100644 --- a/engine/src/gui/control.h +++ b/engine/src/gui/control.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __CONTROL_H__ -#define __CONTROL_H__ +#ifndef VEGA_STRIKE_ENGINE_GUI_CONTROL_H +#define VEGA_STRIKE_ENGINE_GUI_CONTROL_H #include "eventresponder.h" #include "font.h" @@ -136,5 +135,4 @@ class Control : public EventResponder { bool m_hidden; //False = show the control on the window. }; -#endif //__CONTROL_H__ - +#endif //VEGA_STRIKE_ENGINE_GUI_CONTROL_H diff --git a/engine/src/gui/eventmanager.h b/engine/src/gui/eventmanager.h index 18e8717e35..24229f7dd6 100644 --- a/engine/src/gui/eventmanager.h +++ b/engine/src/gui/eventmanager.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __EVENTMANAGER_H__ -#define __EVENTMANAGER_H__ +#ifndef VEGA_STRIKE_ENGINE_GUI_EVENTMANAGER_H +#define VEGA_STRIKE_ENGINE_GUI_EVENTMANAGER_H #include "eventresponder.h" @@ -90,5 +89,4 @@ class EventManager { EventManager &globalEventManager(void); bool hasGlobalEventManager(void); -#endif //__EVENTMANAGER_H__ - +#endif //VEGA_STRIKE_ENGINE_GUI_EVENTMANAGER_H diff --git a/engine/src/gui/eventresponder.h b/engine/src/gui/eventresponder.h index 677d203c9a..f238849646 100644 --- a/engine/src/gui/eventresponder.h +++ b/engine/src/gui/eventresponder.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __EVENTRESPONDER_H__ -#define __EVENTRESPONDER_H__ +#ifndef VEGA_STRIKE_ENGINE_GUI_EVENTRESPONDER_H +#define VEGA_STRIKE_ENGINE_GUI_EVENTRESPONDER_H //See cpp file for detailed descriptions of classes, functions, etc. @@ -92,5 +91,4 @@ class EventResponder { EventResponder *m_commandTarget; //Forward events to this particular responder, not the event chain. }; -#endif //__EVENTRESPONDER_H__ - +#endif //VEGA_STRIKE_ENGINE_GUI_EVENTRESPONDER_H diff --git a/engine/src/gui/font.h b/engine/src/gui/font.h index 01e65a22ba..365f6007b7 100644 --- a/engine/src/gui/font.h +++ b/engine/src/gui/font.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __FONT_H__ -#define __FONT_H__ +#ifndef VEGA_STRIKE_ENGINE_GUI_FONT_H +#define VEGA_STRIKE_ENGINE_GUI_FONT_H #include <string> @@ -132,5 +131,4 @@ class Font { double m_horizontalScaling; //Horizontal factor from char reference space to identity space. }; -#endif //__FONT_H__ - +#endif //VEGA_STRIKE_ENGINE_GUI_FONT_H diff --git a/engine/src/gui/glut_support.h b/engine/src/gui/glut_support.h index 3859fe4523..f5ebfee4dc 100644 --- a/engine/src/gui/glut_support.h +++ b/engine/src/gui/glut_support.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef GLUT_SUPPORT_H -#define GLUT_SUPPORT_H +#ifndef VEGA_STRIKE_ENGINE_GUI_GLUT_SUPPORT_H +#define VEGA_STRIKE_ENGINE_GUI_GLUT_SUPPORT_H /* If you have functions that perform the same operation, but use different parameters, * It may be best if you replace the following functions with wrappers to your own functions @@ -46,5 +45,4 @@ void DrawGlutMouse(int mousex, int mousey, class VSSprite *spr); void EndGUIFrame(MousePointerStyle pointerStyle); extern int HAS_ALPHA; -#endif //GLUT_SUPPORT_H - +#endif //VEGA_STRIKE_ENGINE_GUI_GLUT_SUPPORT_H diff --git a/engine/src/gui/groupcontrol.h b/engine/src/gui/groupcontrol.h index b2d95b0330..2ec946f6a5 100644 --- a/engine/src/gui/groupcontrol.h +++ b/engine/src/gui/groupcontrol.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __GROUPCONTROL_H__ -#define __GROUPCONTROL_H__ +#ifndef VEGA_STRIKE_ENGINE_GUI_GROUP_CONTROL_H +#define VEGA_STRIKE_ENGINE_GUI_GROUP_CONTROL_H #include "gui/control.h" @@ -87,5 +86,4 @@ class GroupControl : public Control { std::vector<Control *> m_controls; }; -#endif //__GROUPCONTROL_H__ - +#endif //VEGA_STRIKE_ENGINE_GUI_GROUP_CONTROL_H diff --git a/engine/src/gui/guidefs.h b/engine/src/gui/guidefs.h index 25a4c47199..4bce8ba716 100644 --- a/engine/src/gui/guidefs.h +++ b/engine/src/gui/guidefs.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __GUIDEFS_H__ -#define __GUIDEFS_H__ +#ifndef VEGA_STRIKE_ENGINE_GUI_GUI_DEFS_H +#define VEGA_STRIKE_ENGINE_GUI_GUI_DEFS_H #include "gfxlib.h" #include "gldrv/winsys.h" @@ -236,5 +235,4 @@ void drawFilledPolygon(const std::vector<Point> &coords, const GFXColor &color); #define guiMin(a, b) ( (a) < (b) ? (a) : (b) ) #define guiMax(a, b) ( (a) > (b) ? (a) : (b) ) -#endif //__GUIDEFS_H__ - +#endif //VEGA_STRIKE_ENGINE_GUI_GUI_DEFS_H diff --git a/engine/src/gui/guitexture.h b/engine/src/gui/guitexture.h index 49f6dc01a4..ecdea24f20 100644 --- a/engine/src/gui/guitexture.h +++ b/engine/src/gui/guitexture.h @@ -19,9 +19,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_GUI_GUI_TEXTURE_H +#define VEGA_STRIKE_ENGINE_GUI_GUI_TEXTURE_H -#ifndef __GUITEXTURE_H__ -#define __GUITEXTURE_H__ #include <string> #include "guidefs.h" @@ -54,5 +54,4 @@ class GuiTexture { */ }; -#endif //__GUITEXTURE_H__ - +#endif //VEGA_STRIKE_ENGINE_GUI_GUI_TEXTURE_H diff --git a/engine/src/gui/modaldialog.h b/engine/src/gui/modaldialog.h index 0169edd7cc..65bb52340a 100644 --- a/engine/src/gui/modaldialog.h +++ b/engine/src/gui/modaldialog.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __MODALDIALOG_H__ -#define __MODALDIALOG_H__ +#ifndef VEGA_STRIKE_ENGINE_GUI_MODAL_DIALOG_H +#define VEGA_STRIKE_ENGINE_GUI_MODAL_DIALOG_H #include "windowcontroller.h" @@ -146,5 +145,4 @@ class ListQuestionDialog : public QuestionDialog { static void CreateControlsForListWindow(Window *w); }; -#endif //__MODALDIALOG_H__ - +#endif //VEGA_STRIKE_ENGINE_GUI_MODAL_DIALOG_H diff --git a/engine/src/gui/newbutton.h b/engine/src/gui/newbutton.h index be9f2151fe..9e5957ea28 100644 --- a/engine/src/gui/newbutton.h +++ b/engine/src/gui/newbutton.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __BUTTON_H__ -#define __BUTTON_H__ +#ifndef VEGA_STRIKE_ENGINE_GUI_BUTTON_H +#define VEGA_STRIKE_ENGINE_GUI_BUTTON_H #include "control.h" #include "painttext.h" @@ -189,5 +188,4 @@ class NewButton : public Control { double m_lastStepTime; //Last time we changed steps. }; -#endif //__BUTTON_H__ - +#endif //VEGA_STRIKE_ENGINE_GUI_BUTTON_H diff --git a/engine/src/gui/painttext.h b/engine/src/gui/painttext.h index e8d2bb041d..4e5de3f6e4 100644 --- a/engine/src/gui/painttext.h +++ b/engine/src/gui/painttext.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __PAINTTEXT_H__ -#define __PAINTTEXT_H__ +#ifndef VEGA_STRIKE_ENGINE_GUI_PAINTTEXT_H +#define VEGA_STRIKE_ENGINE_GUI_PAINTTEXT_H #include <string> #include "guidefs.h" @@ -247,5 +246,4 @@ class PaintText { LayoutState m_layout; //Shared state for layout operation. }; -#endif //__PAINTTEXT_H__ - +#endif //VEGA_STRIKE_ENGINE_GUI_PAINTTEXT_H diff --git a/engine/src/gui/picker.h b/engine/src/gui/picker.h index 485e39c7dc..2f11d50b4b 100644 --- a/engine/src/gui/picker.h +++ b/engine/src/gui/picker.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __PICKER_H__ -#define __PICKER_H__ +#ifndef VEGA_STRIKE_ENGINE_GUI_PICKER_H +#define VEGA_STRIKE_ENGINE_GUI_PICKER_H #include "control.h" #include "painttext.h" @@ -266,5 +265,4 @@ class Picker : public Control { std::vector<DisplayCell> m_displayCells; //Array of cells currently displayed. }; -#endif //__PICKER_H__ - +#endif //VEGA_STRIKE_ENGINE_GUI_PICKER_H diff --git a/engine/src/gui/scroller.h b/engine/src/gui/scroller.h index 4a223a3ecd..56dc9810be 100644 --- a/engine/src/gui/scroller.h +++ b/engine/src/gui/scroller.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __SCROLLER_H__ -#define __SCROLLER_H__ +#ifndef VEGA_STRIKE_ENGINE_GUI_SCROLLER_H +#define VEGA_STRIKE_ENGINE_GUI_SCROLLER_H #include "gui/groupcontrol.h" @@ -99,5 +98,4 @@ class Scroller : public GroupControl { bool m_needLayout; //True = Need to re-layout the controls. }; -#endif //__SCROLLER_H__ - +#endif //VEGA_STRIKE_ENGINE_GUI_SCROLLER_H diff --git a/engine/src/gui/simplepicker.h b/engine/src/gui/simplepicker.h index 5bcbc65ae5..91bce1b0e8 100644 --- a/engine/src/gui/simplepicker.h +++ b/engine/src/gui/simplepicker.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __SIMPLEPICKER_H__ -#define __SIMPLEPICKER_H__ +#ifndef VEGA_STRIKE_ENGINE_GUI_SIMPLEPICKER_H +#define VEGA_STRIKE_ENGINE_GUI_SIMPLEPICKER_H #include "picker.h" @@ -167,5 +166,4 @@ class ValuedPickerCell : public SimplePickerCell { T m_value; }; -#endif //__SIMPLEPICKER_H__ - +#endif //VEGA_STRIKE_ENGINE_GUI_SIMPLEPICKER_H diff --git a/engine/src/gui/slider.h b/engine/src/gui/slider.h index 3a22956428..7125ea293f 100644 --- a/engine/src/gui/slider.h +++ b/engine/src/gui/slider.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __SLIDER_H__ -#define __SLIDER_H__ +#ifndef VEGA_STRIKE_ENGINE_GUI_SLIDER_H +#define VEGA_STRIKE_ENGINE_GUI_SLIDER_H #include "gui/groupcontrol.h" @@ -104,5 +103,4 @@ class Slider : public Control { Rect m_thumbRect; //Remembered position of the thumb. }; -#endif //__SLIDER_H__ - +#endif //VEGA_STRIKE_ENGINE_GUI_SLIDER_H diff --git a/engine/src/gui/staticdisplay.h b/engine/src/gui/staticdisplay.h index 4ed6fe783c..8479bbb778 100644 --- a/engine/src/gui/staticdisplay.h +++ b/engine/src/gui/staticdisplay.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __STATICDISPLAY_H__ -#define __STATICDISPLAY_H__ +#ifndef VEGA_STRIKE_ENGINE_GUI_STATIC_DISPLAY_H +#define VEGA_STRIKE_ENGINE_GUI_STATIC_DISPLAY_H #include "control.h" #include "painttext.h" @@ -159,5 +158,4 @@ class StaticImageDisplay : public Control { //INTERNAL IMPLEMENTATION }; -#endif //__STATICDISPLAY_H__ - +#endif //VEGA_STRIKE_ENGINE_GUI_STATIC_DISPLAY_H diff --git a/engine/src/gui/text_area.h b/engine/src/gui/text_area.h index eb575bdde3..70a52b6202 100644 --- a/engine/src/gui/text_area.h +++ b/engine/src/gui/text_area.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef TEXT_AREA_H -#define TEXT_AREA_H +#ifndef VEGA_STRIKE_ENGINE_GUI_TEXT_AREA_H +#define VEGA_STRIKE_ENGINE_GUI_TEXT_AREA_H //Version: 1.3 - February 27, 2002 //Changes: @@ -257,5 +256,4 @@ class TextAreaItem { void LoadTextures(void); -#endif //TEXT_AREA_H - +#endif //VEGA_STRIKE_ENGINE_GUI_TEXT_AREA_H diff --git a/engine/src/gui/textinputdisplay.h b/engine/src/gui/textinputdisplay.h index b1b74d4086..b5a7f9756f 100644 --- a/engine/src/gui/textinputdisplay.h +++ b/engine/src/gui/textinputdisplay.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __TEXTINPUTDISPLAY_H__ -#define __TEXTINPUTDISPLAY_H__ +#ifndef VEGA_STRIKE_ENGINE_GUI_TEXT_INPUT_DISPLAY_H +#define VEGA_STRIKE_ENGINE_GUI_TEXT_INPUT_DISPLAY_H #include "staticdisplay.h" #include <vector> @@ -51,5 +50,4 @@ class TextInputDisplay : public StaticDisplay { virtual void draw(); }; -#endif //__TEXTINPUTDISPLAY_H__ - +#endif //VEGA_STRIKE_ENGINE_GUI_TEXT_INPUT_DISPLAY_H diff --git a/engine/src/gui/window.h b/engine/src/gui/window.h index 5a3aea0e41..09080220bc 100644 --- a/engine/src/gui/window.h +++ b/engine/src/gui/window.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __WINDOW_H__ -#define __WINDOW_H__ +#ifndef VEGA_STRIKE_ENGINE_GUI_WINDOW_H +#define VEGA_STRIKE_ENGINE_GUI_WINDOW_H #include "eventresponder.h" #include "guitexture.h" @@ -175,5 +174,4 @@ class WindowManager { //Get the one window manager. WindowManager &globalWindowManager(void); -#endif //__WINDOW_H__ - +#endif //VEGA_STRIKE_ENGINE_GUI_WINDOW_H diff --git a/engine/src/gui/windowcontroller.h b/engine/src/gui/windowcontroller.h index 7d9adbe1d0..323354e327 100644 --- a/engine/src/gui/windowcontroller.h +++ b/engine/src/gui/windowcontroller.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __WINDOWCONTROLLER_H__ -#define __WINDOWCONTROLLER_H__ +#ifndef VEGA_STRIKE_ENGINE_GUI_WINDOW_CONTROLLER_H +#define VEGA_STRIKE_ENGINE_GUI_WINDOW_CONTROLLER_H #include "window.h" #include "control.h" @@ -110,5 +109,4 @@ class WctlBase : public WindowController { static const WctlTableEntry WctlCommandTable[]; }; -#endif //__WINDOWCONTROLLER_H__ - +#endif //VEGA_STRIKE_ENGINE_GUI_WINDOW_CONTROLLER_H diff --git a/engine/src/hashtable.h b/engine/src/hashtable.h index b3865e718f..676328f51c 100644 --- a/engine/src/hashtable.h +++ b/engine/src/hashtable.h @@ -19,10 +19,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_HASHTABLE_H +#define VEGA_STRIKE_ENGINE_HASHTABLE_H - -#ifndef _HASHTABLE_H_ -#define _HASHTABLE_H_ #include "gnuhash.h" #include <math.h> #include <string> @@ -32,9 +31,11 @@ #define HASH_INTSIZE (sizeof (int)*8) #define HASH_SALT_0 0x7EF92C3B #define HASH_SALT_1 0x9B + class Unit; //const int hashsize = 1001; //Hashtable doesn't grow + template<class KEY, class VALUE, int SIZ> class Hashtable : public vsUMap<KEY, VALUE *> { typedef std::pair<KEY, VALUE *> HashElement; @@ -103,5 +104,4 @@ class Hashtable : public vsUMap<KEY, VALUE *> { } }; -#endif - +#endif //VEGA_STRIKE_ENGINE_HASHTABLE_H diff --git a/engine/src/heap.h b/engine/src/heap.h index 4b2f758020..eb0747f695 100644 --- a/engine/src/heap.h +++ b/engine/src/heap.h @@ -19,8 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ -#ifndef _VS_HEAP_H_ -#define _VS_HEAP_H_ +#ifndef VEGA_STRIKE_ENGINE_HEAP_H +#define VEGA_STRIKE_ENGINE_HEAP_H #include <vector> #include <algorithm> @@ -100,4 +100,4 @@ class priority_queue : protected std::vector<T> { } -#endif//_VS_HEAP_H_ \ No newline at end of file +#endif //VEGA_STRIKE_ENGINE_HEAP_H diff --git a/engine/src/in.h b/engine/src/in.h index 91ea9e8225..99d3534003 100644 --- a/engine/src/in.h +++ b/engine/src/in.h @@ -19,9 +19,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_IN_H +#define VEGA_STRIKE_ENGINE_IN_H -#ifndef IN_H -#define IN_H enum KBSTATE { UP, DOWN, @@ -35,5 +35,4 @@ typedef void (*KBHandler)(const KBData &, KBSTATE); typedef void (*MouseHandler)(KBSTATE, int x, int y, int delx, int dely, int mod); -#endif - +#endif //VEGA_STRIKE_ENGINE_IN_H diff --git a/engine/src/in_handler.h b/engine/src/in_handler.h index b2b44d0ae4..2fc8ed918d 100644 --- a/engine/src/in_handler.h +++ b/engine/src/in_handler.h @@ -19,9 +19,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_INHANDLER_H +#define VEGA_STRIKE_ENGINE_INHANDLER_H -#ifndef INHANDLER_H -#define INHANDLER_H #include "in_kb.h" //#include "cmd_unit.h" class Unit; @@ -75,5 +75,5 @@ class InputListener { }; //const InputListener End; -#endif +#endif //VEGA_STRIKE_ENGINE_INHANDLER_H diff --git a/engine/src/in_joystick.h b/engine/src/in_joystick.h index 337705c0ab..eb8b2cf4e0 100644 --- a/engine/src/in_joystick.h +++ b/engine/src/in_joystick.h @@ -19,17 +19,17 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_JOYSTICK_H +#define VEGA_STRIKE_ENGINE_JOYSTICK_H /* * Joystick support written by Alexander Rawass <alexannika@users.sourceforge.net> */ #include "in_kb_data.h" -#ifndef _JOYSTICK_H_ -#define _JOYSTICK_H_ #if defined (HAVE_SDL) #include <SDL/SDL.h> -#endif +#endif //defined (HAVE_SDL) #include "vegastrike.h" //#include "glob.h" @@ -80,9 +80,9 @@ class JoyStick { #if defined (HAVE_SDL) SDL_Joystick *joy; -#else +#else //defined (HAVE_SDL) void *otherdata; //bad form to have an ifdef in a struct -#endif +#endif //defined (HAVE_SDL) int nr_of_axes, nr_of_buttons, nr_of_hats; int hat_margin; size_t player; @@ -93,9 +93,9 @@ class JoyStick { JoyStick(); #if defined (IRIX) //could be POSIX type uchar_t? uchar_t digital_hat[MAX_DIGITAL_HATSWITCHES]; -#else +#else //defined (IRIX) unsigned char digital_hat[MAX_DIGITAL_HATSWITCHES]; -#endif +#endif //defined (IRIX) bool debug_digital_hatswitch; @@ -117,5 +117,4 @@ void BindHatswitchKey(int hatswitch, int val_index, KBHandler handler, const KBD void BindDigitalHatswitchKey(int joystick, int hatswitch, int dir_index, KBHandler handler, const KBData &data); void UnbindDigitalHatswitchKey(int joystick, int hatswitch, int dir_index); -#endif //_JOYSTICK_H_ - +#endif //VEGA_STRIKE_ENGINE_JOYSTICK_H diff --git a/engine/src/in_kb.h b/engine/src/in_kb.h index 37af263a14..76cd8a16bf 100644 --- a/engine/src/in_kb.h +++ b/engine/src/in_kb.h @@ -19,14 +19,14 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_IN_KB_H +#define VEGA_STRIKE_ENGINE_IN_KB_H -#ifndef INKB_H -#define INKB_H //#ifdef HAVE_SDL //#include <SDL/SDL_keysym.h> //const int KEYMAP_SIZE =SDLK_LAST; //const int KEY_SPECIAL_OFFSET=0; -//#else +//#else //HAVE_SDL enum KB_MODIFIER_ENUM { KB_MOD_ALT = 1, @@ -39,11 +39,13 @@ enum KB_MODIFIER_ENUM { #include "gldrv/winsys.h" const int KEYMAP_SIZE = WSK_LAST; const int LAST_MODIFIER = KB_MOD_MASK + 1; -#else +#else //NO_GFX const int KEYMAP_SIZE = 0; const int LAST_MODIFIER = 0; -#endif -//#endif +#endif //NO_GFX + +//#endif //HAVE_SDL + #include "in.h" unsigned int getActiveModifiers(); @@ -56,5 +58,5 @@ void BindKey(int key, unsigned int modifiers, unsigned int player, KBHandler han void UnbindKey(int key, unsigned int modifiers); void InitKB(); void RestoreKB(); -#endif +#endif //VEGA_STRIKE_ENGINE_IN_KB_H diff --git a/engine/src/in_kb_data.h b/engine/src/in_kb_data.h index 28c71d8576..da7328e4cc 100644 --- a/engine/src/in_kb_data.h +++ b/engine/src/in_kb_data.h @@ -19,9 +19,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_IN_KB_DATA_H +#define VEGA_STRIKE_ENGINE_IN_KB_DATA_H -#ifndef _IN_KB_DATA_H_ -#define _IN_KB_DATA_H_ #include <string> class KBData { public: @@ -34,4 +34,5 @@ class KBData { this->data = s; } }; -#endif + +#endif //VEGA_STRIKE_ENGINE_IN_KB_DATA_H diff --git a/engine/src/in_main.h b/engine/src/in_main.h index a65c183be1..49dd31a626 100644 --- a/engine/src/in_main.h +++ b/engine/src/in_main.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef INMAIN_H -#define INMAIN_H +#ifndef VEGA_STRIKE_ENGINE_IN_MAIN_H +#define VEGA_STRIKE_ENGINE_IN_MAIN_H #include "in_handler.h" @@ -32,5 +31,5 @@ int TermInput(); void AddListener(InputListener *il); void ActivateListener(InputListener *il); void RemoveListener(InputListener *il); -#endif +#endif //VEGA_STRIKE_ENGINE_IN_MAIN_H diff --git a/engine/src/in_mouse.h b/engine/src/in_mouse.h index 945145ce8d..1a035d1e30 100644 --- a/engine/src/in_mouse.h +++ b/engine/src/in_mouse.h @@ -19,9 +19,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_MOUSE_H +#define VEGA_STRIKE_ENGINE_MOUSE_H -#ifndef _MOUSE_H_ -#define _MOUSE_H_ #include "in.h" extern int mousex, mousey; @@ -34,5 +34,5 @@ void UnbindMouse(int key); int getMouseDrawFunc(); void GetMouseDelta(int &dx, int &dy); int lookupMouseButton(int winsys_button); //returns 0 for left click, 1 for middle, 2 for right. .... -#endif +#endif //VEGA_STRIKE_ENGINE_MOUSE_H diff --git a/engine/src/lin_time.h b/engine/src/lin_time.h index 4e2fa412b7..a561a10cc8 100644 --- a/engine/src/lin_time.h +++ b/engine/src/lin_time.h @@ -19,9 +19,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_LIN_TIME_H +#define VEGA_STRIKE_ENGINE_LIN_TIME_H -#ifndef _LIN_TIME_H_ -#define _LIN_TIME_H_ #include "vegastrike.h" #define VEGA_EPOCH 1136073600. //Jan 1, 2006 GMT @@ -43,5 +43,4 @@ double realTime(); extern float getTimeCompression(); extern void setTimeCompression(float tc); -#endif - +#endif //VEGA_STRIKE_ENGINE_LIN_TIME_H diff --git a/engine/src/linecollide.h b/engine/src/linecollide.h index 5808f38295..2e93661c5d 100644 --- a/engine/src/linecollide.h +++ b/engine/src/linecollide.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef _LINECOLLIDE_H_ -#define _LINECOLLIDE_H_ +#ifndef VEGA_STRIKE_ENGINE_LINECOLLIDE_H +#define VEGA_STRIKE_ENGINE_LINECOLLIDE_H #include <stdlib.h> #include "gfx/vec.h" @@ -90,5 +89,5 @@ struct LineCollide { } }; -#endif +#endif //VEGA_STRIKE_ENGINE_LINECOLLIDE_H diff --git a/engine/src/load_mission.h b/engine/src/load_mission.h index e5b5539e54..6b50693ae2 100644 --- a/engine/src/load_mission.h +++ b/engine/src/load_mission.h @@ -19,7 +19,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +// NO HEADER GUARD void LoadMission(const char *, const std::string &scriptname, bool loadfirst); void delayLoadMission(std::string missionfile); diff --git a/engine/src/macosx_math.h b/engine/src/macosx_math.h index 24ff9eac9e..ff2976d155 100644 --- a/engine/src/macosx_math.h +++ b/engine/src/macosx_math.h @@ -19,9 +19,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_MACOSX_MATH +#define VEGA_STRIKE_ENGINE_MACOSX_MATH -#ifndef MACOSX_MATH -#define MACOSX_MATH /// works on *any* float... INF is 0x7ffffff and -INF is -(1<<31) NaN is 0 extern int float_to_int(float); extern int double_to_int(float); //works on *any* float @@ -32,7 +32,8 @@ extern float cosf( float v ); extern float sinf( float v ); extern float tanf( float v ); extern float powf( float v, float p ); -#endif -#endif +#endif //defined (__APPLE__) || defined (MACOSX) + +#endif //VEGA_STRIKE_ENGINE_MACOSX_MATH diff --git a/engine/src/main_loop.h b/engine/src/main_loop.h index 9c6a1a736f..8af261f8f3 100644 --- a/engine/src/main_loop.h +++ b/engine/src/main_loop.h @@ -19,10 +19,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_MAIN_LOOP_H +#define VEGA_STRIKE_ENGINE_MAIN_LOOP_H - -#ifndef _MAIN_LOOP_H_ -#define _MAIN_LOOP_H_ #include "in.h" #include "cmd/unit_generic.h" void bootstrap_draw(const std::string &message, Animation *SplashScreen = NULL); @@ -84,5 +83,4 @@ void InitializeInput(); void main_loop(); void restore_main_loop(); -#endif - +#endif //VEGA_STRIKE_ENGINE_MAIN_LOOP_H diff --git a/engine/src/mmorpgclient.h b/engine/src/mmorpgclient.h index 5d4b95effa..b1ca70a03d 100644 --- a/engine/src/mmorpgclient.h +++ b/engine/src/mmorpgclient.h @@ -19,10 +19,11 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifdef MMORPGC_INC -#else +// NO HEADER GUARD +// well, technically the MMPORGC_INC acts as one... +#ifndef MMORPGC_INC #define MMORPGC_INC 1 + //linux version is int //extern commandI CommandInterpretor; class POSpack; @@ -60,5 +61,5 @@ class mmoc : public commandI { }; int startThread(void *mmoc2use); -#endif +#endif //MMORPGC_INC diff --git a/engine/src/options.h b/engine/src/options.h index 361ebd6e4a..310528f22e 100644 --- a/engine/src/options.h +++ b/engine/src/options.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef _VS_OPTIONS_H -#define _VS_OPTIONS_H +#ifndef VEGA_STRIKE_ENGINE_OPTIONS_H +#define VEGA_STRIKE_ENGINE_OPTIONS_H #include <string> #include <memory> @@ -343,5 +342,4 @@ class vs_options { extern std::shared_ptr<vs_options> game_options(); -#endif - +#endif //VEGA_STRIKE_ENGINE_OPTIONS_H diff --git a/engine/src/physics.h b/engine/src/physics.h index 9fcde5b65a..df4e7d3d3a 100644 --- a/engine/src/physics.h +++ b/engine/src/physics.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef PHYSICS_H -#define PHYSICS_H +#ifndef VEGA_STRIKE_ENGINE_PHYSICS_H +#define VEGA_STRIKE_ENGINE_PHYSICS_H #include "vs_math.h" #include "gfx/vec.h" @@ -84,5 +83,5 @@ class PhysicsSystem { virtual void Update(); }; -#endif +#endif //VEGA_STRIKE_ENGINE_PHYSICS_H diff --git a/engine/src/precompiled.h b/engine/src/precompiled.h index a212f8d96c..50f5382bbf 100644 --- a/engine/src/precompiled.h +++ b/engine/src/precompiled.h @@ -19,6 +19,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +// NO HEADER GUARD #include <string> #include <vector> @@ -30,30 +31,31 @@ #ifdef _WIN32 #include <hash_map> -#else +#else //_WIN32 #if __GNUC__ != 2 #include <ext/hash_map> - #endif -#endif + #endif //__GNUC__ != 2 +#endif //_WIN32 #include <boost/smart_ptr.hpp> #if !defined (_WIN32) && !defined (__CYGWIN__) #include <stdlib.h> -#else +#else //!defined (_WIN32) && !defined (__CYGWIN__) #ifndef NOMINMAX + //tells VCC not to generate min/max macros #define NOMINMAX - #endif //tells VCC not to generate min/max macros + #endif //NOMINMAX #include <windows.h> -#endif +#endif //!defined (_WIN32) && !defined (__CYGWIN__) #define GL_GLEXT_PROTOTYPES 1 #if defined (__APPLE__) || defined (MACOSX) #include <OpenGL/gl.h> #include <OpenGL/glext.h> -#else +#else //defined (__APPLE__) || defined (MACOSX) #include <GL/gl.h> #include <GL/glext.h> -#endif +#endif //defined (__APPLE__) || defined (MACOSX) diff --git a/engine/src/profile.h b/engine/src/profile.h index 9876bf8046..1716919664 100644 --- a/engine/src/profile.h +++ b/engine/src/profile.h @@ -19,10 +19,11 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +// NO HEADER GUARD #ifdef WIN32 #include <time.h> -#else +#else //WIN32 #include <unistd.h> #include <sys/time.h> @@ -43,5 +44,4 @@ static inline void endTime(const char *comment, const char *file, int lineno) { std::clog << file << "(" << comment << "):" << lineno << ": " << time << std::endl; } -#endif - +#endif //WIN32 diff --git a/engine/src/python/define_odd_unit_functions.h b/engine/src/python/define_odd_unit_functions.h index d165421399..8622cba515 100644 --- a/engine/src/python/define_odd_unit_functions.h +++ b/engine/src/python/define_odd_unit_functions.h @@ -19,6 +19,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +// NO HEADER GUARD void DefineOddUnitFunctions(boost::python::class_builder<UnitWrapper> &Class) { diff --git a/engine/src/python/init.h b/engine/src/python/init.h index f888d61dba..d5fea6edec 100644 --- a/engine/src/python/init.h +++ b/engine/src/python/init.h @@ -19,25 +19,30 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifdef HAVE_PYTHON -//#define HAVE_PYTHON +#ifndef VEGA_STRIKE_ENGINE_PYTHON_INIT_H +#define VEGA_STRIKE_ENGINE_PYTHON_INIT_H -#ifdef HAVE_PYTHON -#ifndef PY_INIT_H_ -#define PY_INIT_H_ #include "gfx/vec.h" #include <boost/version.hpp> + #if BOOST_VERSION != 102800 + #if defined (_MSC_VER) && _MSC_VER <= 1200 #define Vector Vactor -#endif +#endif //defined (_MSC_VER) && _MSC_VER <= 1200 + #include <boost/python.hpp> + #if defined (_MSC_VER) && _MSC_VER <= 1200 #undef Vector -#endif -#else +#endif // defined (_MSC_VER) && _MSC_VER <= 1200 + +#else //defined (_MSC_VER) && _MSC_VER <= 1200 #include <boost/python/detail/extension_class.hpp> -#endif +#endif // defined (_MSC_VER) && _MSC_VER <= 1200 + class Python { public: static void init(); @@ -62,6 +67,7 @@ struct my_builtin_to_python { }; #ifndef BOOST_PYTHON_TO_PYTHON_BY_VALUE + # define BOOST_PYTHON_RETURN_TO_PYTHON_BY_VALUE(T, expr) \ template < class MYTYPE > \ struct to_python_value; \ @@ -102,7 +108,9 @@ struct my_builtin_to_python { # define BOOST_PYTHON_TO_PYTHON_BY_VALUE(T, expr) \ BOOST_PYTHON_RETURN_TO_PYTHON_BY_VALUE( T, expr ) \ BOOST_PYTHON_ARG_TO_PYTHON_BY_VALUE( T, expr ) -#endif + +#endif //BOOST_PYTHON_TO_PYTHON_BY_VALUE + BOOST_PYTHON_TO_PYTHON_BY_VALUE(Vector, boost::python::to_python_value<boost::python::tuple>()(boost::python::make_tuple((double) x.i, @@ -117,7 +125,7 @@ BOOST_PYTHON_TO_PYTHON_BY_VALUE(QVector, x.j, (double) x.k))); -#else +#else //BOOST_VERSION != 102800 inline PyObject * to_python( Vector vec ) { return to_python( boost::python::tuple( (double) vec.i, (double) vec.j, (double) vec.k ) ); @@ -139,7 +147,8 @@ inline QVector from_python( PyObject *p, boost::python::type< QVector >) PyArg_ParseTuple( p, "ddd", &vec.i, &vec.j, &vec.k ); return vec; } -#endif +#endif //BOOST_VERSION != 102800 + BOOST_PYTHON_END_CONVERSION_NAMESPACE void InitBriefing(); @@ -151,7 +160,6 @@ void InitVS2(); void InitBase(); void InitBase2(); -#endif - -#endif +#endif //VEGA_STRIKE_ENGINE_PYTHON_INIT_H +#endif //HAVE_PYTHON diff --git a/engine/src/python/python_class.h b/engine/src/python/python_class.h index 47a8d2f7b5..85a5adacea 100644 --- a/engine/src/python/python_class.h +++ b/engine/src/python/python_class.h @@ -21,38 +21,43 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_PYTHON_PYTHON_CLASS_H +#define VEGA_STRIKE_ENGINE_PYTHON_PYTHON_CLASS_H - -#ifndef __PYTHON_CLASS_H__ -#define __PYTHON_CLASS_H__ //This takes care of the fact that several systems use the _POSIX_C_SOURCES //variable and don't set them to the same thing. //Python.h sets and uses it #ifdef _POSIX_C_SOURCE #undef _POSIX_C_SOURCE -#endif +#endif //_POSIX_C_SOURCE + #include <Python.h> #include <boost/version.hpp> #if defined (_MSC_VER) && _MSC_VER <= 1200 #define Vector Vactor -#endif +#endif //defined (_MSC_VER) && _MSC_VER <= 1200 + #include "boost/python/object.hpp" #include "boost/python/class.hpp" #include "boost/python/call_method.hpp" #include <boost/python.hpp>///module.hpp> + #if defined (_MSC_VER) && _MSC_VER <= 1200 #undef Vector -#endif +#endif //defined (_MSC_VER) && _MSC_VER <= 1200 + #define class_builder class_ #include "init.h" #include "cmd/script/pythonmission.h" #include <compile.h> + #if PY_VERSION_HEX < 0x030B0000 #include <eval.h> -#endif +#endif //PY_VERSION_HEX < 0x030B0000 + #include "python/python_compile.h" #include "cmd/ai/fire.h" #include <memory> @@ -132,10 +137,11 @@ BOOST_PYTHON_BEGIN_CONVERSION_NAMESPACE \ #define PYTHON_INIT_INHERIT_GLOBALS(name,SuperClass) template <> PythonClass <SuperClass> *PythonClass< SuperClass >::last_instance = NULL; \ ADD_FROM_PYTHON_FUNCTION(SuperClass) #define PYTHON_INIT_GLOBALS(name,Class) ADD_FROM_PYTHON_FUNCTION(Class) -#else +#else //FROM_PYTHON_ERRORS #define PYTHON_INIT_INHERIT_GLOBALS(name, SuperClass) template <> PythonClass <SuperClass> *PythonClass< SuperClass >::last_instance = NULL; #define PYTHON_INIT_GLOBALS(name, Class) -#endif +#endif //FROM_PYTHON_ERRORS + //These two functions purposely have opening/closing braces that don't match up #define PYTHON_BEGIN_MODULE(name) BOOST_PYTHON_MODULE(name) { @@ -146,9 +152,9 @@ BOOST_PYTHON_BEGIN_CONVERSION_NAMESPACE \ #if (PY_VERSION_HEX < 0x03000000) #define PYTHON_MODULE_INIT_FUNCTION(name) init##name -#else +#else // (PY_VERSION_HEX < 0x03000000) #define PYTHON_MODULE_INIT_FUNCTION(name) PyInit_##name -#endif +#endif // (PY_VERSION_HEX < 0x03000000) #define PYTHON_END_MODULE(name) } #define PYTHON_INIT_MODULE(name) PYTHON_MODULE_INIT_FUNCTION(name)() @@ -298,5 +304,4 @@ class pythonMission : public PythonClass<PythonMissionBaseClass> { } }; -#endif - +#endif //VEGA_STRIKE_ENGINE_PYTHON_PYTHON_CLASS_H diff --git a/engine/src/python/python_compile.h b/engine/src/python/python_compile.h index 0e964801f5..cbe62edfb9 100644 --- a/engine/src/python/python_compile.h +++ b/engine/src/python/python_compile.h @@ -19,14 +19,13 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef _PYTHON_COMPILE_H_ -#define _PYTHON_COMPILE_H_ +#ifndef VEGA_STRIKE_ENGINE_PYTHON_PYTHON_COMPILE_H +#define VEGA_STRIKE_ENGINE_PYTHON_PYTHON_COMPILE_H //Resets variable for use by python config.h #ifdef _POSIX_C_SOURCE #undef _POSIX_C_SOURCE -#endif +#endif //_POSIX_C_SOURCE #include <Python.h> #include "hashtable.h" @@ -92,5 +91,5 @@ class BasicPointer { return *myitem; } }; -#endif +#endif //VEGA_STRIKE_ENGINE_PYTHON_PYTHON_COMPILE_H diff --git a/engine/src/python/python_unit_wrap.h b/engine/src/python/python_unit_wrap.h index bb5a5fe0d6..1f7ffb81ea 100644 --- a/engine/src/python/python_unit_wrap.h +++ b/engine/src/python/python_unit_wrap.h @@ -19,12 +19,14 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +// NO HEADER GUARD #ifndef WHICH_UNIT_EXPORT_NUMBER #define WHICH_UNIT_EXPORT_NUMBER 0 -#endif +#endif //WHICH_UNIT_EXPORT_NUMBER + #if ((WHICH_UNIT_EXPORT_NUMBER == 3) || (WHICH_UNIT_EXPORT_NUMBER == 2)) -#else +#else //((WHICH_UNIT_EXPORT_NUMBER == 3) || (WHICH_UNIT_EXPORT_NUMBER == 2)) ////////////////////////////AUTOMATIC WRAP////// WRAPPED2(bool, AutoPilotTo, UnitWrapper, un, bool, ignore_energy_requirement, false ) @@ -127,9 +129,10 @@ WRAPPED0(float, GetHullPercent, 0 ) WRAPPED0(float, rSize, 0 ) -#endif -#if WHICH_UNIT_EXPORT_NUMBER == 1 || WHICH_UNIT_EXPORT_NUMBER == 3 -#else +#endif // ((WHICH_UNIT_EXPORT_NUMBER == 3) || (WHICH_UNIT_EXPORT_NUMBER == 2)) + +#if (WHICH_UNIT_EXPORT_NUMBER == 1) || (WHICH_UNIT_EXPORT_NUMBER == 3) +#else // (WHICH_UNIT_EXPORT_NUMBER == 1) || (WHICH_UNIT_EXPORT_NUMBER == 3) WRAPPED1(double, getMinDis, QVector, pnt, 0 ) //for clicklist WRAPPED3(float, querySphere, QVector, start, QVector, end, float, my_unit_radius, @@ -197,9 +200,10 @@ voidWRAPPED1( SetVelocity, Vector, v ) voidWRAPPED1( SetAngularVelocity, Vector, v ) -#endif -#if WHICH_UNIT_EXPORT_NUMBER == 1 || WHICH_UNIT_EXPORT_NUMBER == 2 -#else +#endif // (WHICH_UNIT_EXPORT_NUMBER == 1) || (WHICH_UNIT_EXPORT_NUMBER == 3) + +#if (WHICH_UNIT_EXPORT_NUMBER == 1) || (WHICH_UNIT_EXPORT_NUMBER == 2) +#else // (WHICH_UNIT_EXPORT_NUMBER == 1) || (WHICH_UNIT_EXPORT_NUMBER == 2) WRAPPED0(float, GetMoment, 0 ) WRAPPED0(float, GetMass, @@ -339,5 +343,5 @@ WRAPPED0(int, RepairUpgrade, EXPORT_UTIL3(float, PercentOperational, std::string, content, std::string, category, bool, countHullAndArmorAsFull) WRAPPED1( Vector, MountPercentOperational, int, whichMount, Vector( -1.0f, -1.0f, -1.0f )) -#endif +#endif // (WHICH_UNIT_EXPORT_NUMBER == 1) || (WHICH_UNIT_EXPORT_NUMBER == 2) diff --git a/engine/src/python/star_system_exports.h b/engine/src/python/star_system_exports.h index 19e4e79190..ad5b3eee80 100644 --- a/engine/src/python/star_system_exports.h +++ b/engine/src/python/star_system_exports.h @@ -19,6 +19,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +// NO HEADER GUARD /// Exports functions for python modules /// diff --git a/engine/src/python/unit_exports.h b/engine/src/python/unit_exports.h index 59a399a25c..6d7c681341 100644 --- a/engine/src/python/unit_exports.h +++ b/engine/src/python/unit_exports.h @@ -19,6 +19,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +// NO HEADER GUARD #include "python_class.h" @@ -28,13 +29,15 @@ #include "gfx/vec.h" #include "cmd/unit_generic.h" #include <boost/version.hpp> + #if BOOST_VERSION != 102800 #include <boost/python.hpp> typedef boost::python::dict BoostPythonDictionary; -#else +#else //BOOST_VERSION != 102800 #include <boost/python/objects.hpp> typedef boost::python::dictionary BoostPythonDictionary; -#endif +#endif //BOOST_VERSION != 102800 + #include "universe_util.h" #include "cmd/unit_util.h" #include "faction_generic.h" diff --git a/engine/src/python/unit_from_to_python.h b/engine/src/python/unit_from_to_python.h index 871cafaffb..a5210765d2 100644 --- a/engine/src/python/unit_from_to_python.h +++ b/engine/src/python/unit_from_to_python.h @@ -20,9 +20,11 @@ * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ -#ifndef _UNIT_FROM_TO_PYTHON_H_ -#define _UNIT_FROM_TO_PYTHON_H_ +#ifndef VEGA_STRIKE_ENGINE_PYTHON_UNIT_FROM_TO_PYTHON_H +#define VEGA_STRIKE_ENGINE_PYTHON_UNIT_FROM_TO_PYTHON_H + #include <boost/version.hpp> + #if BOOST_VERSION != 102800 //#include <boost/python/converter/arg_from_python.hpp> @@ -84,7 +86,7 @@ struct default_result_converter::apply<Unit *> { */ BOOST_PYTHON_END_CONVERSION_NAMESPACE -#else +#else //BOOST_VERSION != 102800 TO_PYTHON_SMART_POINTER( UnitWrapper ); TO_PYTHON_SMART_POINTER( Cargo ); @@ -100,6 +102,6 @@ inline Unit * from_python( PyObject *p, boost::python::type< Unit* >) return uw.GetUnit(); } BOOST_PYTHON_END_CONVERSION_NAMESPACE -#endif -#endif +#endif //BOOST_VERSION != 102800 +#endif //VEGA_STRIKE_ENGINE_PYTHON_UNIT_FROM_TO_PYTHON_H diff --git a/engine/src/python/unit_wrapper_class.h b/engine/src/python/unit_wrapper_class.h index e6168f1016..f7d420b313 100644 --- a/engine/src/python/unit_wrapper_class.h +++ b/engine/src/python/unit_wrapper_class.h @@ -19,7 +19,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +// NO HEADER GUARD #include "vs_logging.h" using std::string; diff --git a/engine/src/rendertext.h b/engine/src/rendertext.h index adfc826fca..c3f119d3c2 100644 --- a/engine/src/rendertext.h +++ b/engine/src/rendertext.h @@ -19,6 +19,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +// NO HEADER GUARD #include <string> #include <vector> diff --git a/engine/src/resizable.h b/engine/src/resizable.h index f281efc8fc..6bb361ad2f 100644 --- a/engine/src/resizable.h +++ b/engine/src/resizable.h @@ -19,6 +19,7 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +// NO HEADER GUARD #include <cstdlib> #include <string.h> diff --git a/engine/src/resource/product.h b/engine/src/resource/product.h index 59b9246baa..a1e98de556 100644 --- a/engine/src/resource/product.h +++ b/engine/src/resource/product.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef PRODUCT_H -#define PRODUCT_H +#ifndef VEGA_STRIKE_ENGINE_RESOURCE_PRODUCT_H +#define VEGA_STRIKE_ENGINE_RESOURCE_PRODUCT_H #include <string> @@ -66,4 +65,4 @@ bool operator==(const std::string &lhs, const Product &rhs); bool operator!=(const Product &lhs, const std::string &rhs); bool operator!=(const std::string &lhs, const Product &rhs); -#endif // PRODUCT_H +#endif //VEGA_STRIKE_ENGINE_RESOURCE_PRODUCT_H diff --git a/engine/src/resource/resource.h b/engine/src/resource/resource.h index b9b2e87762..71e8cd81ce 100644 --- a/engine/src/resource/resource.h +++ b/engine/src/resource/resource.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef RESOURCE_H -#define RESOURCE_H +#ifndef VEGA_STRIKE_ENGINE_RESOURCE_RESOURCE_H +#define VEGA_STRIKE_ENGINE_RESOURCE_RESOURCE_H /** * @brief A resource is any part of the game that can be used up and filled up. @@ -124,4 +123,4 @@ T operator/(const Resource<T> &lhs, const T &rhs); template<typename T> T operator/(const T &lhs, const Resource<T> &rhs); -#endif // RESOURCE_H +#endif //VEGA_STRIKE_ENGINE_RESOURCE_RESOURCE_H diff --git a/engine/src/resource/store.h b/engine/src/resource/store.h index 29806a38f7..2d2b5a12da 100644 --- a/engine/src/resource/store.h +++ b/engine/src/resource/store.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef STORE_H -#define STORE_H +#ifndef VEGA_STRIKE_ENGINE_RESOURCE_STORE_H +#define VEGA_STRIKE_ENGINE_RESOURCE_STORE_H #include <vector> @@ -62,6 +61,4 @@ class Store void Stock(std::vector<Product> stock); }; - - -#endif // STORE_H +#endif //VEGA_STRIKE_ENGINE_RESOURCE_STORE_H diff --git a/engine/src/save_util.h b/engine/src/save_util.h index 327a9e0706..ddb5bbbb69 100644 --- a/engine/src/save_util.h +++ b/engine/src/save_util.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __SAVE_UTIL_H__ -#define __SAVE_UTIL_H__ +#ifndef VEGA_STRIKE_ENGINE_SAVE_UTIL_H +#define VEGA_STRIKE_ENGINE_SAVE_UTIL_H #include <string> using std::string; @@ -52,5 +51,5 @@ const std::vector<std::string> &getStringList(int playernum, const std::string & void saveStringList(int playernum, const std::string &mykey, const std::vector<std::string> &names); void saveDataList(int playernum, const std::string &mykey, const std::vector<float> &values); -#endif +#endif //VEGA_STRIKE_ENGINE_SAVE_UTIL_H diff --git a/engine/src/savegame.h b/engine/src/savegame.h index f52de30dc6..c537130231 100644 --- a/engine/src/savegame.h +++ b/engine/src/savegame.h @@ -19,11 +19,10 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - +#ifndef VEGA_STRIKE_ENGINE_SAVEGAME_H +#define VEGA_STRIKE_ENGINE_SAVEGAME_H //#include "cmd/script/mission.h" -#ifndef __SAVEGAME_H -#define __SAVEGAME_H #include "gfx/vec.h" @@ -162,5 +161,5 @@ std::string SetCurrentSaveGame(std::string newname); const std::string &GetSaveDir(); void CopySavedShips(std::string filename, int player_num, const std::vector<std::string> &starships, bool load); bool isUtf8SaveGame(std::string filename); -#endif +#endif //VEGA_STRIKE_ENGINE_SAVEGAME_H diff --git a/engine/src/ship_commands.h b/engine/src/ship_commands.h index 4ade237b15..64efc17880 100644 --- a/engine/src/ship_commands.h +++ b/engine/src/ship_commands.h @@ -22,12 +22,10 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __SHIP_COMMANDS_H__INCLUDED__ -#define __SHIP_COMMANDS_H__INCLUDED__ +#ifndef VEGA_STRIKE_ENGINE_SHIP_COMMANDS_H +#define VEGA_STRIKE_ENGINE_SHIP_COMMANDS_H extern void InitShipCommands(); extern void UninitShipCommands(); -#endif //__SHIP_COMMANDS_H__INCLUDED__ - +#endif //VEGA_STRIKE_ENGINE_SHIP_COMMANDS_H diff --git a/engine/src/star_system.h b/engine/src/star_system.h index 2e5b9a4d8e..a6d4683474 100644 --- a/engine/src/star_system.h +++ b/engine/src/star_system.h @@ -19,10 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef _SYSTEM_H_ -#define _SYSTEM_H_ +#ifndef VEGA_STRIKE_ENGINE_SYSTEM_H +#define VEGA_STRIKE_ENGINE_SYSTEM_H #include "cmd/collection.h" #include "cmd/container.h" @@ -234,5 +232,5 @@ class StarSystem { int DoJumpingLeaveSightAndSound(Unit *un); }; -#endif +#endif //VEGA_STRIKE_ENGINE_SYSTEM_H diff --git a/engine/src/star_system_generic.h b/engine/src/star_system_generic.h index f879318adf..d164a25a66 100644 --- a/engine/src/star_system_generic.h +++ b/engine/src/star_system_generic.h @@ -22,4 +22,5 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +// NO HEADER GUARD diff --git a/engine/src/star_xml.h b/engine/src/star_xml.h index ba7d96b179..ba72c03375 100644 --- a/engine/src/star_xml.h +++ b/engine/src/star_xml.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef STAR_XML_H -#define STAR_XML_H +#ifndef VEGA_STRIKE_ENGINE_STAR_XML_H +#define VEGA_STRIKE_ENGINE_STAR_XML_H #include "xml_support.h" @@ -267,4 +266,4 @@ const EnumMap attribute_map(attribute_names, sizeof(attribute_names) / sizeof(at } -#endif // STAR_XML_H +#endif //VEGA_STRIKE_ENGINE_STAR_XML_H diff --git a/engine/src/stardate.h b/engine/src/stardate.h index 6756cdb629..f15a49a56a 100644 --- a/engine/src/stardate.h +++ b/engine/src/stardate.h @@ -19,6 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_STARDATE_H +#define VEGA_STRIKE_ENGINE_STARDATE_H /// Provides functions for stardate and startime manipulation and conversion /// There are various time measurement systems in VS @@ -35,9 +37,6 @@ * Compact date format is days.hours */ -#ifndef __STARDATE_H -#define __STARDATE_H - #include <string> using std::string; @@ -76,5 +75,5 @@ class StarDate { string TrekDateFromSDate(string sdate); }; -#endif +#endif //VEGA_STRIKE_ENGINE_STARDATE_H diff --git a/engine/src/system_factory.h b/engine/src/system_factory.h index 686e050c1e..511b1a093f 100644 --- a/engine/src/system_factory.h +++ b/engine/src/system_factory.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef SYSTEM_FACTORY_H -#define SYSTEM_FACTORY_H +#ifndef VEGA_STRIKE_ENGINE_SYSTEM_FACTORY_H +#define VEGA_STRIKE_ENGINE_SYSTEM_FACTORY_H #include "gfx/vec.h" #include "gfxlib_struct.h" @@ -106,4 +105,4 @@ class SystemFactory { GFXColor initializeColor(Object object); }; -#endif // SYSTEM_FACTORY_H +#endif //VEGA_STRIKE_ENGINE_SYSTEM_FACTORY_H diff --git a/engine/src/universe.h b/engine/src/universe.h index 6cb1d4e4bf..c69db54955 100644 --- a/engine/src/universe.h +++ b/engine/src/universe.h @@ -19,8 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ -#ifndef _WrapGFX_H -#define _WrapGFX_H +#ifndef VEGA_STRIKE_ENGINE_UNIVERSE_H +#define VEGA_STRIKE_ENGINE_UNIVERSE_H #include "gfx/camera.h" #include "star_system.h" @@ -137,5 +137,5 @@ class Universe { UnitCollection &getActiveStarSystemUnitList(); unsigned int numPlayers(); }; -#endif +#endif //VEGA_STRIKE_ENGINE_UNIVERSE_H diff --git a/engine/src/universe_globals.h b/engine/src/universe_globals.h index 4edb670d48..10290dab2c 100644 --- a/engine/src/universe_globals.h +++ b/engine/src/universe_globals.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef UNIVERSE_GLOBALS_H -#define UNIVERSE_GLOBALS_H +#ifndef VEGA_STRIKE_ENGINE_UNIVERSE_GLOBALS_H +#define VEGA_STRIKE_ENGINE_UNIVERSE_GLOBALS_H #include <vector> using std::vector; @@ -41,4 +40,4 @@ extern vector<StarSystem *> _active_star_systems; // TODO: understand why we can't use active_star_system instead extern StarSystem *_script_system; -#endif // UNIVERSE_GLOBALS_H +#endif //VEGA_STRIKE_ENGINE_UNIVERSE_GLOBALS_H diff --git a/engine/src/universe_util.h b/engine/src/universe_util.h index ebd381af71..7fad8cb7a3 100644 --- a/engine/src/universe_util.h +++ b/engine/src/universe_util.h @@ -19,11 +19,11 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_UNIVERSE_UTIL_GENERIC_H +#define VEGA_STRIKE_ENGINE_UNIVERSE_UTIL_GENERIC_H /// Headers for python modules /// -#ifndef _UNIVERSE_UTILGENERIC_H__ -#define _UNIVERSE_UTILGENERIC_H__ #include "cmd/collection.h" #include "gfx/vec.h" #include "cmd/unit_util.h" @@ -444,5 +444,5 @@ void startMenuInterface(bool firsttime, } #undef activeSys -#endif +#endif //VEGA_STRIKE_ENGINE_UNIVERSE_UTIL_GENERIC_H diff --git a/engine/src/vega_cast_utils.h b/engine/src/vega_cast_utils.h index 87966c0bfb..ac2b5f4323 100644 --- a/engine/src/vega_cast_utils.h +++ b/engine/src/vega_cast_utils.h @@ -21,9 +21,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef VEGA_STRIKE_SRC_VEGA_CAST_UTILS_H_ -#define VEGA_STRIKE_SRC_VEGA_CAST_UTILS_H_ +#ifndef VEGA_STRIKE_ENGINE_VEGA_CAST_UTILS_H +#define VEGA_STRIKE_ENGINE_VEGA_CAST_UTILS_H #include <typeinfo> #include <cstdlib> @@ -63,4 +62,4 @@ inline const TargetType* vega_dynamic_const_cast_ptr(const SourceType* from) { return ret_val; } -#endif //VEGA_STRIKE_SRC_VEGA_CAST_UTILS_H_ +#endif //VEGA_STRIKE_ENGINE_VEGA_CAST_UTILS_H diff --git a/engine/src/vega_py_run.h b/engine/src/vega_py_run.h index 957a15ac20..afd326e0c6 100644 --- a/engine/src/vega_py_run.h +++ b/engine/src/vega_py_run.h @@ -21,14 +21,12 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef VEGA_STRIKE_SRC_VEGA_PY_RUN_H_ -#define VEGA_STRIKE_SRC_VEGA_PY_RUN_H_ +#ifndef VEGA_STRIKE_ENGINE_VEGA_PY_RUN_H +#define VEGA_STRIKE_ENGINE_VEGA_PY_RUN_H #include <string> void VegaPyRunString(char * py_snippet); void VegaPyRunString(const std::string& py_snippet); -#endif //VEGA_STRIKE_SRC_VEGA_PY_RUN_H_ +#endif //VEGA_STRIKE_ENGINE_VEGA_PY_RUN_H diff --git a/engine/src/vega_string_utils.h b/engine/src/vega_string_utils.h index 3ff7efe9b3..8eec7008b1 100644 --- a/engine/src/vega_string_utils.h +++ b/engine/src/vega_string_utils.h @@ -21,9 +21,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef VEGA_STRIKE_SRC_VEGA_STRING_UTILS_H_ -#define VEGA_STRIKE_SRC_VEGA_STRING_UTILS_H_ +#ifndef VEGA_STRIKE_ENGINE_VEGA_STRING_UTILS_H +#define VEGA_STRIKE_ENGINE_VEGA_STRING_UTILS_H #include "vs_logging.h" #include "vs_exit.h" @@ -33,7 +32,7 @@ inline char *vega_str_dup(const char *string) { return strdup(string); #elif defined (_WINDOWS) return _strdup(string); -#else +#else //_XOPEN_SOURCE >= 500 || _POSIX_C_SOURCE >= 200809L size_t buf_size = strlen(string) + 1; char *alloc; alloc = (char *)malloc(buf_size); @@ -45,7 +44,7 @@ inline char *vega_str_dup(const char *string) { strncpy(alloc, string, buf_size); alloc[buf_size - 1] = '\0'; return alloc; -#endif +#endif //_XOPEN_SOURCE >= 500 || _POSIX_C_SOURCE >= 200809L } -#endif //VEGA_STRIKE_SRC_VEGA_STRING_UTILS_H_ +#endif //VEGA_STRIKE_ENGINE_VEGA_STRING_UTILS_H diff --git a/engine/src/vegastrike.h b/engine/src/vegastrike.h index ff3bab8d8c..5dab1d53cf 100644 --- a/engine/src/vegastrike.h +++ b/engine/src/vegastrike.h @@ -21,14 +21,12 @@ * * Portions of this code from Tux Racer by Jasmin F. Patry www.tuxracer.com */ - +#ifndef VEGA_STRIKE_ENGINE_VEGASTRIKE_H +#define VEGA_STRIKE_ENGINE_VEGASTRIKE_H #ifdef __cplusplus #include <assert.h> -#endif - -#ifndef _VEGASTRIKE_H_ -#define _VEGASTRIKE_H_ +#endif //__cplusplus extern float simulation_atom_var; extern float audio_atom_var; @@ -61,26 +59,26 @@ extern float AUDIO_ATOM; #include <windows.h> //#include <wingdi.h> #include <time.h> -#else +#else //defined (WIN32) || defined (__CYGWIN__) #include <sys/time.h> #include <sys/stat.h> #include <unistd.h> //#include "command.h" -#endif /* defined( WIN32 ) || defined( __CYGWIN__ ) */ +#endif //defined (WIN32) || defined (__CYGWIN__) #ifndef NO_GFX #if defined (__APPLE__) || defined (MACOSX) #include <OpenGL/gl.h> #include <OpenGL/glu.h> #include <GLUT/glut.h> - #else + #else //defined (__APPLE__) || defined (MACOSX) #define __glext_h_ #include <GL/gl.h> #include <GL/glu.h> #include <GL/glut.h> #undef __glext_h_ - #endif -#endif + #endif //defined (__APPLE__) || defined (MACOSX) +#endif //NO_GFX #define PROG_NAME "vegastrike" @@ -88,9 +86,8 @@ extern float AUDIO_ATOM; //#define RANDOMIZE_SIM_ATOMS 1 -#endif - #ifdef __cplusplus -#endif +#endif //__cplusplus +#endif //VEGA_STRIKE_ENGINE_VEGASTRIKE_H diff --git a/engine/src/vs_exit.h b/engine/src/vs_exit.h index 859d09a0b1..24b0ccbfaa 100644 --- a/engine/src/vs_exit.h +++ b/engine/src/vs_exit.h @@ -21,10 +21,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef VEGA_STRIKE_SRC_VS_EXIT_H_ -#define VEGA_STRIKE_SRC_VS_EXIT_H_ +#ifndef VEGA_STRIKE_ENGINE_VS_EXIT_H +#define VEGA_STRIKE_ENGINE_VS_EXIT_H extern void VSExit(int code); -#endif //VEGA_STRIKE_SRC_VS_EXIT_H_ +#endif //VEGA_STRIKE_ENGINE_VS_EXIT_H diff --git a/engine/src/vs_globals.h b/engine/src/vs_globals.h index 0087b41c2d..1a592a693d 100644 --- a/engine/src/vs_globals.h +++ b/engine/src/vs_globals.h @@ -19,9 +19,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_VS_GLOBALS_H +#define VEGA_STRIKE_ENGINE_VS_GLOBALS_H -#ifndef __VS_GLOBALS_H_ -#define __VS_GLOBALS_H_ #include <vector> #include "command.h" @@ -134,5 +134,4 @@ extern ForceFeedback *forcefeedback; extern double benchmark; -#endif - +#endif //VEGA_STRIKE_ENGINE_VS_GLOBALS_H diff --git a/engine/src/vs_logging.h b/engine/src/vs_logging.h index ce98b48b01..abc89652ba 100644 --- a/engine/src/vs_logging.h +++ b/engine/src/vs_logging.h @@ -19,10 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef VEGASTRIKE_VS_LOGGING_H -#define VEGASTRIKE_VS_LOGGING_H +#ifndef VEGA_STRIKE_ENGINE_VS_LOGGING_H +#define VEGA_STRIKE_ENGINE_VS_LOGGING_H #include <cstdint> @@ -88,4 +86,4 @@ extern boost::shared_ptr<VegaStrikeLogger> vega_logger(); } // namespace VegaStrikeLogging -#endif // VEGASTRIKE_VS_LOGGING_H +#endif //VEGA_STRIKE_ENGINE_VS_LOGGING_H diff --git a/engine/src/vs_math.h b/engine/src/vs_math.h index 9fa0679d80..c3dadfe96e 100644 --- a/engine/src/vs_math.h +++ b/engine/src/vs_math.h @@ -21,10 +21,8 @@ * * Portions of this code from Tux Racer by Jasmin F. Patry www.tuxracer.com */ - - -#ifndef _VS_MATH_H_ -#define _VS_MATH_H_ +#ifndef VEGA_STRIKE_ENGINE_VS_MATH_H +#define VEGA_STRIKE_ENGINE_VS_MATH_H #include <config.h> @@ -35,21 +33,23 @@ #ifdef HAVE_IEEEFP_H #include <ieeefp.h> -#endif +#endif //HAVE_IEEEFP_H #ifndef M_PI #define M_PI 3.14159265358979323846 -#endif +#endif //M_PI + #ifndef PI #define PI M_PI -#endif +#endif //PI + #ifndef M_1_PI #define M_1_PI (1/M_PI) -#endif +#endif //M_1_PI #define FINITE(x) ( std::isfinite( x ) ) #define ISNAN(x) ( std:: isnan( x ) ) #define VS_PI 3.1415926535897931 -#endif // _VS_MATH_H_ +#endif //VEGA_STRIKE_ENGINE_VS_MATH_H diff --git a/engine/src/vs_random.h b/engine/src/vs_random.h index 2af70ca699..b655b316c8 100644 --- a/engine/src/vs_random.h +++ b/engine/src/vs_random.h @@ -31,6 +31,7 @@ * http://www.math.keio.ac.jp/matumoto/emt.html * email: matumoto@math.keio.ac.jp */ +// NO HEADER GUARD /* * #define N 624 diff --git a/engine/src/vs_vector.h b/engine/src/vs_vector.h index 26e63479e3..7b00234b3f 100644 --- a/engine/src/vs_vector.h +++ b/engine/src/vs_vector.h @@ -21,10 +21,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef VEGA_STRIKE_SRC_VS_VECTOR_H_ -#define VEGA_STRIKE_SRC_VS_VECTOR_H_ +#ifndef VEGA_STRIKE_ENGINE_VS_VECTOR_H +#define VEGA_STRIKE_ENGINE_VS_VECTOR_H #include <cstddef> #include <memory> @@ -48,5 +46,4 @@ class vs_vector : public std::vector<MyType, Allocator> { } -#endif // VEGA_STRIKE_SRC_VS_VECTOR_H_ - +#endif //VEGA_STRIKE_ENGINE_VS_VECTOR_H diff --git a/engine/src/vsfilesystem.h b/engine/src/vsfilesystem.h index a307a04dc2..8b024c4597 100644 --- a/engine/src/vsfilesystem.h +++ b/engine/src/vsfilesystem.h @@ -19,10 +19,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ +#ifndef VEGA_STRIKE_ENGINE_VSFILESYS_H +#define VEGA_STRIKE_ENGINE_VSFILESYS_H - -#ifndef __VSFILESYS_H -#define __VSFILESYS_H #include <cstdio> #include <string> #include <vector> @@ -646,4 +645,4 @@ std::string nameof(VSFileSystem::VSFileType type); // int (*compar)( const struct dirent**, const struct dirent** ) ); //#endif -#endif +#endif //VEGA_STRIKE_ENGINE_VSFILESYS_H diff --git a/engine/src/xml_serializer.h b/engine/src/xml_serializer.h index 0ba0c37475..099cf098ed 100644 --- a/engine/src/xml_serializer.h +++ b/engine/src/xml_serializer.h @@ -20,8 +20,9 @@ * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ -#ifndef _XML_SERIALIZER_H_ -#define _XML_SERIALIZER_H_ +#ifndef VEGA_STRIKE_ENGINE_XML_SERIALIZER_H +#define VEGA_STRIKE_ENGINE_XML_SERIALIZER_H + #include "xml_support.h" #include <vector> #include <string> @@ -191,5 +192,6 @@ class XMLSerializer { this->filename = fil; } }; -#endif + +#endif //VEGA_STRIKE_ENGINE_XML_SERIALIZER_H diff --git a/engine/src/xml_support.h b/engine/src/xml_support.h index 70310e6af8..3ca1047662 100644 --- a/engine/src/xml_support.h +++ b/engine/src/xml_support.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef _XML_SUPPORT_H_ -#define _XML_SUPPORT_H_ +#ifndef VEGA_STRIKE_ENGINE_XML_SUPPORT_H +#define VEGA_STRIKE_ENGINE_XML_SUPPORT_H #include <cstdio> #include <string> @@ -145,12 +144,14 @@ inline std::string VectorToString(const Vector &v) { } return ret; } -/*#else +/* + * #else //WIN32 * inline template<class T> string tostring(T num) { * return string(((ostrstream*)&(ostrstream() << num << '\0'))->str()); * * } - #endif*/ + * #endif //WIN32 + */ } -#endif +#endif //VEGA_STRIKE_ENGINE_XML_SUPPORT_H diff --git a/engine/tools/common.h b/engine/tools/common.h index b3b0604a2b..ac7cd5a23c 100644 --- a/engine/tools/common.h +++ b/engine/tools/common.h @@ -19,8 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ -#ifndef COMMON_CODE_FOR_VSRP_TOOLS_ -#define COMMON_CODE_FOR_VSRP_TOOLS_ +#ifndef VEGA_STRIKE_ENGINE_TOOLS_COMMON_H +#define VEGA_STRIKE_ENGINE_TOOLS_COMMON_H #include <stdio.h> #include <stdint.h> #include <string> @@ -73,4 +73,4 @@ struct VSRMember { } }; -#endif //COMMON_CODE_FOR_VSRP_TOOLS_ +#endif //VEGA_STRIKE_ENGINE_TOOLS_COMMON_H diff --git a/engine/tools/vsrtools.h b/engine/tools/vsrtools.h index 8a6ed70aea..60c2a60800 100644 --- a/engine/tools/vsrtools.h +++ b/engine/tools/vsrtools.h @@ -19,8 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ -#ifndef VSR_TOOLS_H_ -#define VSR_TOOLS_H_ +#ifndef VEGA_STRIKE_ENGINE_TOOLS_VSR_H +#define VEGA_STRIKE_ENGINE_TOOLS_VSR_H #include <stdint.h> /** The standard header found in all Vega Strike resource package files. */ struct VSRHeader { @@ -35,4 +35,4 @@ struct VSRPEntry { uint32_t offset; ///The offset this file starts in the package. char filename[256]; ///The complete path to the file, terminating with '\0'. }; -#endif //VSR_TOOLS_H_ +#endif //VEGA_STRIKE_ENGINE_TOOLS_VSR_H diff --git a/engine/vs_cubemap_gen/src/color/color.h b/engine/vs_cubemap_gen/src/color/color.h index 8162ab76fe..5adf47b880 100644 --- a/engine/vs_cubemap_gen/src/color/color.h +++ b/engine/vs_cubemap_gen/src/color/color.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __COLOR_H__ -#define __COLOR_H__ +#ifndef VEGA_STRIKE_ENGINE_CUBE_MAP_COLOR_H +#define VEGA_STRIKE_ENGINE_CUBE_MAP_COLOR_H /* Note: This "color.h" file is NOT meant as a general color library, by any stretch. Only those color * manipulation functions that are used in vs_cubemap_gen are implemented. We try to be minimalistic @@ -93,6 +92,4 @@ struct dRGBAcol { } }; -#endif - - +#endif //VEGA_STRIKE_ENGINE_CUBE_MAP_COLOR_H diff --git a/engine/vs_cubemap_gen/src/command/command.h b/engine/vs_cubemap_gen/src/command/command.h index 6286b089b1..d3e693817d 100644 --- a/engine/vs_cubemap_gen/src/command/command.h +++ b/engine/vs_cubemap_gen/src/command/command.h @@ -22,12 +22,9 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __COMMAND_H__ -#define __COMMAND_H__ +#ifndef VEGA_STRIKE_ENGINE_CUBE_MAP_COMMAND_H +#define VEGA_STRIKE_ENGINE_CUBE_MAP_COMMAND_H int command(int argc, char *argv[]); -#endif - - +#endif //VEGA_STRIKE_ENGINE_CUBE_MAP_COMMAND_H diff --git a/engine/vs_cubemap_gen/src/errors/errors.h b/engine/vs_cubemap_gen/src/errors/errors.h index b920e121b1..7bf4de9e21 100644 --- a/engine/vs_cubemap_gen/src/errors/errors.h +++ b/engine/vs_cubemap_gen/src/errors/errors.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __ERRORS_H__ -#define __ERRORS_H__ +#ifndef VEGA_STRIKE_ENGINE_CUBE_MAP_ERRORS_H +#define VEGA_STRIKE_ENGINE_CUBE_MAP_ERRORS_H #include <ostream> #include <fstream> @@ -63,6 +62,4 @@ class MissingTexture : public Exception { } }; -#endif - - +#endif //VEGA_STRIKE_ENGINE_CUBE_MAP_ERRORS_H diff --git a/engine/vs_cubemap_gen/src/file_io/file_io.h b/engine/vs_cubemap_gen/src/file_io/file_io.h index 3a6943ed11..d0eba9aff7 100644 --- a/engine/vs_cubemap_gen/src/file_io/file_io.h +++ b/engine/vs_cubemap_gen/src/file_io/file_io.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __FILE_IO_H__ -#define __FILE_IO_H__ +#ifndef VEGA_STRIKE_ENGINE_CUBE_MAP_FILE_IO_H +#define VEGA_STRIKE_ENGINE_CUBE_MAP_FILE_IO_H mem_texture &load_texture_png(std::string filename); mem_texture &load_texture_set_png @@ -42,6 +41,4 @@ void nvcompress_set_png(...); void pack_dds_mip(...); void pack_dds_all(...); -#endif - - +#endif //VEGA_STRIKE_ENGINE_CUBE_MAP_FILE_IO_H diff --git a/engine/vs_cubemap_gen/src/filter/filter.h b/engine/vs_cubemap_gen/src/filter/filter.h index b95b3bca4c..ccb6125181 100644 --- a/engine/vs_cubemap_gen/src/filter/filter.h +++ b/engine/vs_cubemap_gen/src/filter/filter.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __FILTER_H__ -#define __FILTER_H__ +#ifndef VEGA_STRIKE_ENGINE_CUBE_MAP_FILTER_H +#define VEGA_STRIKE_ENGINE_CUBE_MAP_FILTER_H class mem_cubemap; #include "../units/radians.h" @@ -57,6 +56,4 @@ class filter_mip { void do_it(); }; -#endif - - +#endif //VEGA_STRIKE_ENGINE_CUBE_MAP_FILTER_H diff --git a/engine/vs_cubemap_gen/src/filter/filter_impl/filter_math.h b/engine/vs_cubemap_gen/src/filter/filter_impl/filter_math.h index cc7a33b06b..3e18e8d70f 100644 --- a/engine/vs_cubemap_gen/src/filter/filter_impl/filter_math.h +++ b/engine/vs_cubemap_gen/src/filter/filter_impl/filter_math.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __FILTER_MATH_H__ -#define __FILTER_MATH_H__ +#ifndef VEGA_STRIKE_ENGINE_CUBE_MAP_FILTER_MATH_H +#define VEGA_STRIKE_ENGINE_CUBE_MAP_FILTER_MATH_H #include <math.h> #include "../../units/units.h" @@ -60,6 +59,4 @@ inline float flt_decay(Shininess shininess, fvector v1, fvector v2) { return powf(maxf(0.0, dotf(v1, v2)), shininess); } -#endif - - +#endif //VEGA_STRIKE_ENGINE_CUBE_MAP_FILTER_MATH_H diff --git a/engine/vs_cubemap_gen/src/filter/filter_impl/filter_one_texel.h b/engine/vs_cubemap_gen/src/filter/filter_impl/filter_one_texel.h index 6095e7ac9d..567698033b 100644 --- a/engine/vs_cubemap_gen/src/filter/filter_impl/filter_one_texel.h +++ b/engine/vs_cubemap_gen/src/filter/filter_impl/filter_one_texel.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __FILTER_ONE_TEX_H__ -#define __FILTER_ONE_TEX_H__ +#ifndef VEGA_STRIKE_ENGINE_CUBE_MAP_FILTER_ONE_TEX_H +#define VEGA_STRIKE_ENGINE_CUBE_MAP_FILTER_ONE_TEX_H /* * This class is a functor that is created for each texel of the target texture. It's operator()() takes a ray @@ -58,6 +57,4 @@ class filter_one_texel { fRGBAcol operator()(fvector const *ray); }; -#endif - - +#endif //VEGA_STRIKE_ENGINE_CUBE_MAP_FILTER_ONE_TEX_H diff --git a/engine/vs_cubemap_gen/src/filter/filter_settings.h b/engine/vs_cubemap_gen/src/filter/filter_settings.h index d7de831c54..f2ca0fa671 100644 --- a/engine/vs_cubemap_gen/src/filter/filter_settings.h +++ b/engine/vs_cubemap_gen/src/filter/filter_settings.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __FILTER_MATH_H__ -#define __FILTER_MATH_H__ +#ifndef VEGA_STRIKE_ENGINE_CUBE_MAP_FILTER_MATH_H +#define VEGA_STRIKE_ENGINE_CUBE_MAP_FILTER_MATH_H class filter_settings { //input params: @@ -46,6 +45,4 @@ class filter_settings { void print(); }; -#endif - - +#endif //VEGA_STRIKE_ENGINE_CUBE_MAP_FILTER_MATH_H diff --git a/engine/vs_cubemap_gen/src/first.h b/engine/vs_cubemap_gen/src/first.h index 4a0c67d724..22c9ced0f2 100644 --- a/engine/vs_cubemap_gen/src/first.h +++ b/engine/vs_cubemap_gen/src/first.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __FIRST_H__ -#define __FIRST_H__ +#ifndef VEGA_STRIKE_ENGINE_CUBE_MAP_FIRST_H +#define VEGA_STRIKE_ENGINE_CUBE_MAP_FIRST_H /* Always include this file first */ @@ -71,6 +70,4 @@ inline T operator-(T const &a, T const &b) { #include "units/steradians.h" #include "units/shininess.h" -#endif - - +#endif //VEGA_STRIKE_ENGINE_CUBE_MAP_FIRST_H diff --git a/engine/vs_cubemap_gen/src/fvector/fvector.h b/engine/vs_cubemap_gen/src/fvector/fvector.h index 33e3d3eaba..7f7feb61b6 100644 --- a/engine/vs_cubemap_gen/src/fvector/fvector.h +++ b/engine/vs_cubemap_gen/src/fvector/fvector.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __FVECTOR_H__ -#define __FVECTOR_H__ +#ifndef VEGA_STRIKE_ENGINE_CUBE_MAP_FVECTOR_H +#define VEGA_STRIKE_ENGINE_CUBE_MAP_FVECTOR_H //fvector used to be a class, but it's a struct for speed reasons, to appear as a POD to the compiler struct fvector { @@ -35,6 +34,4 @@ struct fvector { void fast_renormalize(); }; -#endif - - +#endif //VEGA_STRIKE_ENGINE_CUBE_MAP_FVECTOR_H diff --git a/engine/vs_cubemap_gen/src/process/process.h b/engine/vs_cubemap_gen/src/process/process.h index 7ac8a13843..82d20bbf12 100644 --- a/engine/vs_cubemap_gen/src/process/process.h +++ b/engine/vs_cubemap_gen/src/process/process.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __PROCESS_H__ -#define __PROCESS_H__ +#ifndef VEGA_STRIKE_ENGINE_CUBE_MAP_PROCESS_H +#define VEGA_STRIKE_ENGINE_CUBE_MAP_PROCESS_H /* * The purpose of this is to control the general processing: reading the input * textures into floating point memory textures, allocating memory textures for @@ -35,6 +34,4 @@ class process { public }; -#endif - - +#endif //VEGA_STRIKE_ENGINE_CUBE_MAP_PROCESS_H diff --git a/engine/vs_cubemap_gen/src/settings/settings.h b/engine/vs_cubemap_gen/src/settings/settings.h index f93ca34fc7..e3624d0819 100644 --- a/engine/vs_cubemap_gen/src/settings/settings.h +++ b/engine/vs_cubemap_gen/src/settings/settings.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __SETTINGS_H__ -#define __SETTINGS_H__ +#ifndef VEGA_STRIKE_ENGINE_CUBE_MAP_SETTINGS_H +#define VEGA_STRIKE_ENGINE_CUBE_MAP_SETTINGS_H class settings { public: @@ -29,6 +28,4 @@ class settings { void save_settings() const; }; -#endif - - +#endif //VEGA_STRIKE_ENGINE_CUBE_MAP_SETTINGS_H diff --git a/engine/vs_cubemap_gen/src/texture/mem_texture.h b/engine/vs_cubemap_gen/src/texture/mem_texture.h index 5a456583ea..e7855f89ff 100644 --- a/engine/vs_cubemap_gen/src/texture/mem_texture.h +++ b/engine/vs_cubemap_gen/src/texture/mem_texture.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __MEM_TEXTURE_H__ -#define __MEM_TEXTURE_H__ +#ifndef VEGA_STRIKE_ENGINE_CUBE_MAP_MEM_TEXTURE_H +#define VEGA_STRIKE_ENGINE_CUBE_MAP_MEM_TEXTURE_H //this file presents: class mem_texture; @@ -57,6 +56,4 @@ class mem_tex { RectIterRanges get_iter_ranges(side_and_coords const &sc1, side_and_coords const &sc2); }; -#endif - - +#endif //VEGA_STRIKE_ENGINE_CUBE_MAP_MEM_TEXTURE_H diff --git a/engine/vs_cubemap_gen/src/texture/mem_texture_impl/coords.h b/engine/vs_cubemap_gen/src/texture/mem_texture_impl/coords.h index 3c9eb3b1e2..6f2032397d 100644 --- a/engine/vs_cubemap_gen/src/texture/mem_texture_impl/coords.h +++ b/engine/vs_cubemap_gen/src/texture/mem_texture_impl/coords.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __COORDS_H__ -#define __COORDS_H__ +#ifndef VEGA_STRIKE_ENGINE_CUBE_MAP_COORDS_H +#define VEGA_STRIKE_ENGINE_CUBE_MAP_COORDS_H //this file presents: class icoords; @@ -146,6 +145,4 @@ class ccoords { } }; -#endif - - +#endif //VEGA_STRIKE_ENGINE_CUBE_MAP_COORDS_H diff --git a/engine/vs_cubemap_gen/src/texture/mem_texture_impl/side.h b/engine/vs_cubemap_gen/src/texture/mem_texture_impl/side.h index 6e91269a47..92b47ea9cf 100644 --- a/engine/vs_cubemap_gen/src/texture/mem_texture_impl/side.h +++ b/engine/vs_cubemap_gen/src/texture/mem_texture_impl/side.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __SIDE_H__ -#define __SIDE_H__ +#ifndef VEGA_STRIKE_ENGINE_CUBE_MAP_SIDE_H +#define VEGA_STRIKE_ENGINE_CUBE_MAP_SIDE_H //this file presents: enum eSides { eLeft = 0, eRight, eUp, eDown, eFront, eBack }; @@ -63,6 +62,4 @@ struct side { } }; -#endif - - +#endif //VEGA_STRIKE_ENGINE_CUBE_MAP_SIDE_H diff --git a/engine/vs_cubemap_gen/src/texture/texture_settings.h b/engine/vs_cubemap_gen/src/texture/texture_settings.h index ca07769ff7..bb6ea66f51 100644 --- a/engine/vs_cubemap_gen/src/texture/texture_settings.h +++ b/engine/vs_cubemap_gen/src/texture/texture_settings.h @@ -19,10 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - - -#ifndef __TEXTURE_SETTINGS_H__ -#define __TEXTURE_SETTINGS_H__ +#ifndef VEGA_STRIKE_ENGINE_CUBE_MAP_TEXTURE_SETTINGS_H +#define VEGA_STRIKE_ENGINE_CUBE_MAP_TEXTURE_SETTINGS_H class texture_settings { //input params: @@ -49,6 +47,4 @@ class texture_settings { void init(); }; -#endif - - +#endif //VEGA_STRIKE_ENGINE_CUBE_MAP_TEXTURE_SETTINGS_H diff --git a/engine/vs_cubemap_gen/src/units/units.h b/engine/vs_cubemap_gen/src/units/units.h index fa6eea82dd..2e14aca0bb 100644 --- a/engine/vs_cubemap_gen/src/units/units.h +++ b/engine/vs_cubemap_gen/src/units/units.h @@ -19,9 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ - -#ifndef __UNITS_H__ -#define __UNITS_H__ +#ifndef VEGA_STRIKE_ENGINE_CUBE_MAP_UNITS_H +#define VEGA_STRIKE_ENGINE_CUBE_MAP_UNITS_H #include <boost/serialization/strong_typedef.hpp> @@ -33,6 +32,4 @@ BOOST_STRONG_TYPEDEF(double, dRadians); BOOST_STRONG_TYPEDEF(double, dSteradians); BOOST_STRONG_TYPEDEF(double, dShininess); -#endif - - +#endif //VEGA_STRIKE_ENGINE_CUBE_MAP_UNITS_H From fcb8618a10346094ed3cf37548cbf23528785be0 Mon Sep 17 00:00:00 2001 From: Benjamen Meyer <bm_witness@yahoo.com> Date: Tue, 6 Jun 2023 00:37:28 -0400 Subject: [PATCH 2/4] Peer Review: Typo --- engine/mission/include/hashtable.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/mission/include/hashtable.h b/engine/mission/include/hashtable.h index 8251263a2b..c193a4ca69 100644 --- a/engine/mission/include/hashtable.h +++ b/engine/mission/include/hashtable.h @@ -19,8 +19,8 @@ * You should have received a copy of the GNU General Public License * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. */ -#ifndef VEGA_STRIKE_ENGINE_MISION_HASHTABLE_H -#define VEGA_STRIKE_ENGINE_MISION_HASHTABLE_H +#ifndef VEGA_STRIKE_ENGINE_MISSION_HASHTABLE_H +#define VEGA_STRIKE_ENGINE_MISSION_HASHTABLE_H #include <math.h> #include <list> @@ -110,4 +110,4 @@ class Hashtable { */ }; -#endif //VEGA_STRIKE_ENGINE_MISION_HASHTABLE_H +#endif //VEGA_STRIKE_ENGINE_MISSION_HASHTABLE_H From f57caae5c3560a12a7288498911715bd5b0f04a5 Mon Sep 17 00:00:00 2001 From: Benjamen Meyer <bm_witness@yahoo.com> Date: Wed, 7 Jun 2023 01:05:33 -0400 Subject: [PATCH 3/4] Enhancement: Ignore Vim Swap Files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7d06e2af28..615253b380 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ ext/ packages/ *.log *.bak +*.sw? *.kdev4 .vs/ .vscode/ From e37deb1638e6edcd92792e9e10d48c5e2e1509e8 Mon Sep 17 00:00:00 2001 From: Benjamen Meyer <bm_witness@yahoo.com> Date: Wed, 7 Jun 2023 01:20:48 -0400 Subject: [PATCH 4/4] Peer Review: Updated Copyrights --- engine/cmake-config.h.in | 2 +- engine/launcher/general.h | 2 +- engine/launcher/resource.h | 2 +- engine/mission/include/central.h | 2 +- engine/mission/include/display_gtk.h | 2 +- engine/mission/include/easydom.h | 4 ++-- engine/mission/include/file.h | 4 ++-- engine/mission/include/general.h | 4 ++-- engine/mission/include/hashtable.h | 4 ++-- engine/mission/include/xml_support.h | 2 +- engine/objconv/basemaker/base_maker_texture.h | 2 +- engine/objconv/basemaker/sprite.h | 2 +- engine/objconv/mesher/Converter.h | 2 +- engine/objconv/mesher/PrecompiledHeaders/Converter.h | 2 +- engine/objconv/mesher/PrecompiledHeaders/Standard.h | 2 +- engine/objconv/mesher/expat.h | 1 + engine/objconv/mesher/from_BFXM.h | 2 +- engine/objconv/mesher/from_obj.h | 2 +- engine/objconv/mesher/mesh.h | 2 +- engine/objconv/mesher/mesh_io.h | 2 +- engine/objconv/mesher/to_BFXM.h | 2 +- engine/objconv/mesher/to_OgreMesh.h | 2 +- engine/objconv/mesher/to_obj.h | 2 +- engine/objconv/trisort.h | 2 +- engine/setup/src/include/central.h | 4 ++-- engine/setup/src/include/display.h | 4 ++-- engine/setup/src/include/dont_link/display_console.h | 2 +- engine/setup/src/include/file.h | 2 +- engine/setup/src/include/general.h | 4 ++-- engine/src/SharedPool.h | 2 +- engine/src/Singleton.h | 2 +- engine/src/XMLDocument.h | 2 +- engine/src/abstract_config.h | 2 +- engine/src/aldrv/al_globals.h | 2 +- engine/src/atmospheric_fog_mesh.h | 2 +- engine/src/audio/CodecRegistry.h | 2 +- engine/src/audio/Exceptions.h | 2 +- engine/src/audio/Format.h | 2 +- engine/src/audio/Listener.h | 2 +- engine/src/audio/Matrix.h | 2 +- engine/src/audio/RenderableListener.h | 2 +- engine/src/audio/RenderableSource.h | 2 +- engine/src/audio/Renderer.h | 2 +- engine/src/audio/Scene.h | 2 +- engine/src/audio/SceneManager.h | 2 +- engine/src/audio/SimpleScene.h | 2 +- engine/src/audio/SimpleSound.h | 2 +- engine/src/audio/SimpleSource.h | 2 +- engine/src/audio/Sound.h | 2 +- engine/src/audio/SoundBuffer.h | 2 +- engine/src/audio/Source.h | 2 +- engine/src/audio/SourceListener.h | 2 +- engine/src/audio/SourceTemplate.h | 2 +- engine/src/audio/Stream.h | 2 +- engine/src/audio/Types.h | 2 +- engine/src/audio/Vector.h | 2 +- engine/src/audio/VirtualIterator.h | 2 +- engine/src/audio/codecs/Codec.h | 2 +- engine/src/audio/codecs/FFCodec.h | 2 +- engine/src/audio/codecs/FFStream.h | 2 +- engine/src/audio/codecs/OggCodec.h | 2 +- engine/src/audio/codecs/OggData.h | 2 +- engine/src/audio/codecs/OggStream.h | 2 +- engine/src/audio/renderers/OpenAL/BorrowedOpenALRenderer.h | 2 +- engine/src/audio/renderers/OpenAL/OpenALHelpers.h | 2 +- engine/src/audio/renderers/OpenAL/OpenALRenderableListener.h | 2 +- engine/src/audio/renderers/OpenAL/OpenALRenderableSource.h | 2 +- .../audio/renderers/OpenAL/OpenALRenderableStreamingSource.h | 2 +- engine/src/audio/renderers/OpenAL/OpenALRenderer.h | 2 +- engine/src/audio/renderers/OpenAL/OpenALSimpleSound.h | 2 +- engine/src/audio/renderers/OpenAL/OpenALStreamingSound.h | 2 +- engine/src/audio/renderers/OpenAL/al.h | 2 +- engine/src/audio/test.h | 2 +- engine/src/audio/utils.h | 2 +- engine/src/audiolib.h | 2 +- engine/src/cg_global.h | 2 +- engine/src/cmd/ai/aggressive.h | 2 +- engine/src/cmd/ai/autodocking.h | 2 +- engine/src/cmd/ai/comm_ai.h | 2 +- engine/src/cmd/ai/communication.h | 2 +- engine/src/cmd/ai/docking.h | 2 +- engine/src/cmd/ai/event_xml.h | 2 +- engine/src/cmd/ai/fire.h | 2 +- engine/src/cmd/ai/fireall.h | 2 +- engine/src/cmd/ai/firekeyboard.h | 2 +- engine/src/cmd/ai/flybywire.h | 2 +- engine/src/cmd/ai/flyjoystick.h | 2 +- engine/src/cmd/ai/flykeyboard.h | 2 +- engine/src/cmd/ai/hard_coded_scripts.h | 2 +- engine/src/cmd/ai/ikarus.h | 2 +- engine/src/cmd/ai/missionscript.h | 2 +- engine/src/cmd/ai/navigation.h | 2 +- engine/src/cmd/ai/order.h | 2 +- engine/src/cmd/ai/pythonai.h | 2 +- engine/src/cmd/ai/script.h | 2 +- engine/src/cmd/ai/tactics.h | 2 +- engine/src/cmd/ai/turretai.h | 2 +- engine/src/cmd/ai/warpto.h | 2 +- engine/src/cmd/alphacurve.h | 2 +- engine/src/cmd/armed.h | 2 +- engine/src/cmd/asteroid.h | 2 +- engine/src/cmd/atmosphere.h | 2 +- engine/src/cmd/audible.h | 2 +- engine/src/cmd/base.h | 2 +- engine/src/cmd/base_util.h | 2 +- engine/src/cmd/basecomputer.h | 2 +- engine/src/cmd/beam.h | 2 +- engine/src/cmd/bolt.h | 2 +- engine/src/cmd/briefing.h | 2 +- engine/src/cmd/building.h | 2 +- engine/src/cmd/cargo.h | 2 +- engine/src/cmd/carrier.h | 2 +- engine/src/cmd/click_list.h | 2 +- engine/src/cmd/collection.h | 2 +- engine/src/cmd/collide.h | 2 +- engine/src/cmd/collide2/CSopcodecollider.h | 2 +- engine/src/cmd/collide2/Ice/IceAABB.h | 1 + engine/src/cmd/collide2/Ice/IceAxes.h | 1 + engine/src/cmd/collide2/Ice/IceBoundingSphere.h | 1 + engine/src/cmd/collide2/Ice/IceContainer.h | 1 + engine/src/cmd/collide2/Ice/IceFPU.h | 1 + engine/src/cmd/collide2/Ice/IceHPoint.h | 1 + engine/src/cmd/collide2/Ice/IceIndexedTriangle.h | 1 + engine/src/cmd/collide2/Ice/IceLSS.h | 1 + engine/src/cmd/collide2/Ice/IceMatrix3x3.h | 1 + engine/src/cmd/collide2/Ice/IceMatrix4x4.h | 1 + engine/src/cmd/collide2/Ice/IceMemoryMacros.h | 1 + engine/src/cmd/collide2/Ice/IceOBB.h | 1 + engine/src/cmd/collide2/Ice/IcePairs.h | 1 + engine/src/cmd/collide2/Ice/IcePlane.h | 1 + engine/src/cmd/collide2/Ice/IcePoint.h | 2 +- engine/src/cmd/collide2/Ice/IcePreprocessor.h | 1 + engine/src/cmd/collide2/Ice/IceRandom.h | 1 + engine/src/cmd/collide2/Ice/IceRay.h | 1 + engine/src/cmd/collide2/Ice/IceRevisitedRadix.h | 1 + engine/src/cmd/collide2/Ice/IceSegment.h | 1 + engine/src/cmd/collide2/Ice/IceTriangle.h | 1 + engine/src/cmd/collide2/Ice/IceTrilist.h | 1 + engine/src/cmd/collide2/Ice/IceTypes.h | 1 + engine/src/cmd/collide2/Ice/IceUtils.h | 1 + engine/src/cmd/collide2/OPC_AABBCollider.h | 1 + engine/src/cmd/collide2/OPC_AABBTree.h | 1 + engine/src/cmd/collide2/OPC_BaseModel.h | 1 + engine/src/cmd/collide2/OPC_BoxBoxOverlap.h | 2 +- engine/src/cmd/collide2/OPC_BoxPruning.h | 1 + engine/src/cmd/collide2/OPC_Collider.h | 1 + engine/src/cmd/collide2/OPC_Common.h | 1 + engine/src/cmd/collide2/OPC_HybridModel.h | 1 + engine/src/cmd/collide2/OPC_LSSCollider.h | 1 + engine/src/cmd/collide2/OPC_MeshInterface.h | 1 + engine/src/cmd/collide2/OPC_Model.h | 1 + engine/src/cmd/collide2/OPC_OBBCollider.h | 1 + engine/src/cmd/collide2/OPC_OptimizedTree.h | 1 + engine/src/cmd/collide2/OPC_Picking.h | 1 + engine/src/cmd/collide2/OPC_PlanesAABBOverlap.h | 2 +- engine/src/cmd/collide2/OPC_PlanesCollider.h | 1 + engine/src/cmd/collide2/OPC_PlanesTriOverlap.h | 1 + engine/src/cmd/collide2/OPC_RayCollider.h | 1 + engine/src/cmd/collide2/OPC_Settings.h | 1 + engine/src/cmd/collide2/OPC_SphereAABBOverlap.h | 1 + engine/src/cmd/collide2/OPC_SphereCollider.h | 1 + engine/src/cmd/collide2/OPC_SweepAndPrune.h | 1 + engine/src/cmd/collide2/OPC_TreeBuilders.h | 4 ++-- engine/src/cmd/collide2/OPC_TreeCollider.h | 1 + engine/src/cmd/collide2/OPC_TriBoxOverlap.h | 1 + engine/src/cmd/collide2/OPC_TriTriOverlap.h | 4 ++-- engine/src/cmd/collide2/OPC_VolumeCollider.h | 1 + engine/src/cmd/collide2/Opcode.h | 1 + engine/src/cmd/collide2/Stdafx.h | 2 +- engine/src/cmd/collide2/basecollider.h | 2 +- engine/src/cmd/collide2/csgeom2/opbox.h | 2 +- engine/src/cmd/collide2/csgeom2/opmath.h | 2 +- engine/src/cmd/collide2/csgeom2/opmatrix3.h | 2 +- engine/src/cmd/collide2/csgeom2/optransfrm.h | 2 +- engine/src/cmd/collide2/csgeom2/opvector3.h | 2 +- engine/src/cmd/collide2/opcodealgorithms.h | 1 + engine/src/cmd/collide2/opcodeextern.h | 1 + engine/src/cmd/collide2/opcodegarray.h | 1 + engine/src/cmd/collide2/opcodeqint.h | 1 + engine/src/cmd/collide2/opcodeqsqrt.h | 1 + engine/src/cmd/collide2/opcodesysdef.h | 2 +- engine/src/cmd/collide2/opcodetypes.h | 2 +- engine/src/cmd/collide2/segmentcell.h | 2 +- engine/src/cmd/collide_map.h | 2 +- engine/src/cmd/collision.h | 2 +- engine/src/cmd/computer.h | 2 +- engine/src/cmd/cont_terrain.h | 2 +- engine/src/cmd/container.h | 2 +- engine/src/cmd/csv.h | 2 +- engine/src/cmd/damageable.h | 2 +- engine/src/cmd/drawable.h | 2 +- engine/src/cmd/energetic.h | 2 +- engine/src/cmd/engineVersion.h | 2 +- engine/src/cmd/enhancement.h | 2 +- engine/src/cmd/faction_factory.h | 2 +- engine/src/cmd/fg_util.h | 2 +- engine/src/cmd/images.h | 2 +- engine/src/cmd/intelligent.h | 2 +- engine/src/cmd/jump_capable.h | 2 +- engine/src/cmd/key_mutable_set.h | 2 +- engine/src/cmd/missile.h | 2 +- engine/src/cmd/mount.h | 2 +- engine/src/cmd/mount_size.h | 2 +- engine/src/cmd/movable.h | 2 +- engine/src/cmd/music.h | 2 +- engine/src/cmd/nebula.h | 4 ++-- engine/src/cmd/oldcollection.h | 2 +- engine/src/cmd/pilot.h | 2 +- engine/src/cmd/planet.h | 4 ++-- engine/src/cmd/planetary_orbit.h | 2 +- engine/src/cmd/role_bitmask.h | 2 +- engine/src/cmd/script/c_alike/c_alike.h | 2 +- engine/src/cmd/script/c_alike/c_alike.tab.cpp.h | 2 +- engine/src/cmd/script/flightgroup.h | 2 +- engine/src/cmd/script/mission.h | 2 +- engine/src/cmd/script/mission_types.h | 2 +- engine/src/cmd/script/msgcenter.h | 2 +- engine/src/cmd/script/pythonmission.h | 2 +- engine/src/cmd/terrain.h | 2 +- engine/src/cmd/testcollection/unit.h | 2 +- engine/src/cmd/turret.h | 2 +- engine/src/cmd/unit_click.h | 2 +- engine/src/cmd/unit_collide.h | 2 +- engine/src/cmd/unit_const_cache.h | 2 +- engine/src/cmd/unit_csv.h | 2 +- engine/src/cmd/unit_csv_factory.h | 2 +- engine/src/cmd/unit_customize.h | 2 +- engine/src/cmd/unit_find.h | 2 +- engine/src/cmd/unit_generic.h | 2 +- engine/src/cmd/unit_json_factory.h | 2 +- engine/src/cmd/unit_optimize_factory.h | 2 +- engine/src/cmd/unit_physics.h | 4 ++-- engine/src/cmd/unit_type.h | 2 +- engine/src/cmd/unit_util.h | 2 +- engine/src/cmd/unit_xml.h | 2 +- engine/src/cmd/upgradeable_unit.h | 2 +- engine/src/cmd/vs_limits.h | 2 +- engine/src/cmd/weapon_factory.h | 2 +- engine/src/cmd/weapon_info.h | 2 +- engine/src/cmd/weapon_type.h | 2 +- engine/src/command.h | 2 +- engine/src/common/common.h | 2 +- engine/src/config_xml.h | 2 +- engine/src/configuration/configuration.h | 4 ++-- engine/src/configuration/game_config.h | 2 +- engine/src/configxml.h | 2 +- engine/src/damage/core_vector.h | 2 +- engine/src/damage/damage.h | 2 +- engine/src/damage/damageable_layer.h | 2 +- engine/src/damage/damageable_object.h | 2 +- engine/src/damage/facet_configuration.h | 2 +- engine/src/damage/health.h | 2 +- engine/src/debug_vs.h | 2 +- engine/src/easydom.h | 4 ++-- engine/src/endianness.h | 2 +- engine/src/faction_generic.h | 2 +- engine/src/ffmpeg_init.h | 2 +- engine/src/file_main.h | 2 +- engine/src/force_feedback.h | 4 ++-- engine/src/functors.h | 4 ++-- engine/src/galaxy.h | 2 +- engine/src/galaxy_gen.h | 4 ++-- engine/src/galaxy_xml.h | 2 +- engine/src/gamemenu.h | 2 +- engine/src/gfx/aligned.h | 4 ++-- engine/src/gfx/ani_texture.h | 2 +- engine/src/gfx/animation.h | 4 ++-- engine/src/gfx/aux_logo.h | 4 ++-- engine/src/gfx/aux_palette.h | 2 +- engine/src/gfx/aux_texture.h | 2 +- engine/src/gfx/background.h | 2 +- engine/src/gfx/boltdrawmanager.h | 2 +- engine/src/gfx/camera.h | 2 +- engine/src/gfx/car_assist.h | 2 +- engine/src/gfx/cockpit.h | 2 +- engine/src/gfx/cockpit_generic.h | 2 +- engine/src/gfx/cockpit_gfx.h | 2 +- engine/src/gfx/cockpit_gfx_utils.h | 2 +- engine/src/gfx/coord_select.h | 2 +- engine/src/gfx/decalqueue.h | 2 +- engine/src/gfx/env_map_gent.h | 2 +- engine/src/gfx/gauge.h | 2 +- engine/src/gfx/halo.h | 2 +- engine/src/gfx/halo_system.h | 2 +- engine/src/gfx/hud.h | 4 ++-- engine/src/gfx/jpeg_memory.h | 2 +- engine/src/gfx/lerp.h | 2 +- engine/src/gfx/loc_select.h | 2 +- engine/src/gfx/masks.h | 2 +- engine/src/gfx/matrix.h | 2 +- engine/src/gfx/mesh.h | 2 +- engine/src/gfx/mesh_bxm.h | 2 +- engine/src/gfx/mesh_io.h | 2 +- engine/src/gfx/mesh_xml.h | 2 +- engine/src/gfx/nav/criteria.h | 2 +- engine/src/gfx/nav/drawlist.h | 2 +- engine/src/gfx/nav/navcomputer.h | 4 ++-- engine/src/gfx/nav/navgetxmldata.h | 2 +- engine/src/gfx/nav/navitemstodraw.h | 2 +- engine/src/gfx/nav/navitemtypes.h | 2 +- engine/src/gfx/nav/navparse.h | 2 +- engine/src/gfx/nav/navpath.h | 2 +- engine/src/gfx/nav/navscreen.h | 2 +- engine/src/gfx/nav/navscreenoccupied.h | 2 +- engine/src/gfx/nonlinear_transform.h | 2 +- engine/src/gfx/occlusion.h | 2 +- engine/src/gfx/particle.h | 2 +- engine/src/gfx/pass.h | 2 +- engine/src/gfx/pipelined_texture.h | 2 +- engine/src/gfx/point_to_cam.h | 2 +- engine/src/gfx/quadsquare.h | 2 +- engine/src/gfx/quadtree.h | 2 +- engine/src/gfx/quaternion.h | 2 +- engine/src/gfx/radar/bubble_display.h | 2 +- engine/src/gfx/radar/dual_display.h | 2 +- engine/src/gfx/radar/null_display.h | 2 +- engine/src/gfx/radar/plane_display.h | 2 +- engine/src/gfx/radar/radar.h | 2 +- engine/src/gfx/radar/sensor.h | 2 +- engine/src/gfx/radar/sphere_display.h | 2 +- engine/src/gfx/radar/track.h | 2 +- engine/src/gfx/radar/viewarea.h | 2 +- engine/src/gfx/ring.h | 2 +- engine/src/gfx/screenshot.h | 2 +- engine/src/gfx/soundcontainer.h | 2 +- engine/src/gfx/soundcontainer_aldrv.h | 2 +- engine/src/gfx/soundcontainer_generic.h | 2 +- engine/src/gfx/sphere.h | 2 +- engine/src/gfx/sprite.h | 4 ++-- engine/src/gfx/star.h | 2 +- engine/src/gfx/stream_texture.h | 2 +- engine/src/gfx/technique.h | 2 +- engine/src/gfx/texture_manager.h | 2 +- engine/src/gfx/tvector.h | 4 ++-- engine/src/gfx/vdu.h | 2 +- engine/src/gfx/vec.h | 2 +- engine/src/gfx/vectorizable.h | 2 +- engine/src/gfx/vertex.h | 2 +- engine/src/gfx/vid_file.h | 2 +- engine/src/gfx/vsbox.h | 2 +- engine/src/gfx/vsimage.h | 2 +- engine/src/gfx/warptrail.h | 2 +- engine/src/gfxlib.h | 2 +- engine/src/gfxlib_struct.h | 2 +- engine/src/gldrv/gl_globals.h | 4 ++-- engine/src/gldrv/gl_include.h | 2 +- engine/src/gldrv/gl_init.h | 2 +- engine/src/gldrv/gl_light.h | 2 +- engine/src/gldrv/gl_matrix.h | 2 +- engine/src/gldrv/gl_undefined_extensions.h | 2 +- engine/src/gldrv/glx_undefined_extensions.h | 2 +- engine/src/gldrv/hashtable_3d.h | 2 +- engine/src/gldrv/sdds.h | 2 +- engine/src/gldrv/winsys.h | 1 + engine/src/gnuhash.h | 2 +- engine/src/gui/button.h | 2 +- engine/src/gui/control.h | 2 +- engine/src/gui/eventmanager.h | 4 ++-- engine/src/gui/eventresponder.h | 4 ++-- engine/src/gui/font.h | 4 ++-- engine/src/gui/glut_support.h | 2 +- engine/src/gui/groupcontrol.h | 4 ++-- engine/src/gui/guidefs.h | 4 ++-- engine/src/gui/guitexture.h | 4 ++-- engine/src/gui/modaldialog.h | 4 ++-- engine/src/gui/newbutton.h | 4 ++-- engine/src/gui/painttext.h | 4 ++-- engine/src/gui/picker.h | 4 ++-- engine/src/gui/scroller.h | 4 ++-- engine/src/gui/simplepicker.h | 4 ++-- engine/src/gui/slider.h | 4 ++-- engine/src/gui/staticdisplay.h | 4 ++-- engine/src/gui/text_area.h | 4 ++-- engine/src/gui/textinputdisplay.h | 4 ++-- engine/src/gui/window.h | 4 ++-- engine/src/gui/windowcontroller.h | 4 ++-- engine/src/hashtable.h | 4 ++-- engine/src/heap.h | 4 ++-- engine/src/in.h | 2 +- engine/src/in_handler.h | 4 ++-- engine/src/in_joystick.h | 4 ++-- engine/src/in_kb.h | 2 +- engine/src/in_kb_data.h | 2 +- engine/src/in_main.h | 2 +- engine/src/in_mouse.h | 2 +- engine/src/lin_time.h | 2 +- engine/src/linecollide.h | 2 +- engine/src/load_mission.h | 2 +- engine/src/macosx_math.h | 2 +- engine/src/main_loop.h | 2 +- engine/src/mmorpgclient.h | 2 +- engine/src/options.h | 2 +- engine/src/physics.h | 2 +- engine/src/posh.h | 2 +- engine/src/precompiled.h | 2 +- engine/src/profile.h | 2 +- engine/src/python/define_odd_unit_functions.h | 2 +- engine/src/python/init.h | 2 +- engine/src/python/python_class.h | 2 +- engine/src/python/python_compile.h | 2 +- engine/src/python/python_unit_wrap.h | 2 +- engine/src/python/star_system_exports.h | 2 +- engine/src/python/unit_exports.h | 2 +- engine/src/python/unit_from_to_python.h | 2 +- engine/src/python/unit_wrapper_class.h | 2 +- engine/src/rendertext.h | 2 +- engine/src/resizable.h | 2 +- engine/src/resource/product.h | 2 +- engine/src/resource/resource.h | 2 +- engine/src/resource/store.h | 2 +- engine/src/save_util.h | 2 +- engine/src/savegame.h | 2 +- engine/src/ship_commands.h | 2 +- engine/src/star_system.h | 2 +- engine/src/star_system_generic.h | 2 +- engine/src/star_xml.h | 2 +- engine/src/stardate.h | 2 +- engine/src/system_factory.h | 2 +- engine/src/universe.h | 2 +- engine/src/universe_globals.h | 2 +- engine/src/universe_util.h | 2 +- engine/src/vega_cast_utils.h | 2 +- engine/src/vega_py_run.h | 2 +- engine/src/vega_string_utils.h | 2 +- engine/src/vegastrike.h | 2 +- engine/src/vs_exit.h | 2 +- engine/src/vs_globals.h | 2 +- engine/src/vs_logging.h | 2 +- engine/src/vs_math.h | 2 +- engine/src/vs_random.h | 1 + engine/src/vs_vector.h | 2 +- engine/src/vsfilesystem.h | 4 ++-- engine/src/xml_serializer.h | 2 +- engine/src/xml_support.h | 2 +- engine/tools/common.h | 4 ++-- engine/tools/vsrtools.h | 4 ++-- engine/vs_cubemap_gen/src/color/color.h | 2 +- engine/vs_cubemap_gen/src/command/command.h | 2 +- engine/vs_cubemap_gen/src/errors/errors.h | 2 +- engine/vs_cubemap_gen/src/file_io/file_io.h | 4 ++-- engine/vs_cubemap_gen/src/filter/filter.h | 2 +- engine/vs_cubemap_gen/src/filter/filter_impl/filter_math.h | 2 +- .../vs_cubemap_gen/src/filter/filter_impl/filter_one_texel.h | 2 +- engine/vs_cubemap_gen/src/filter/filter_settings.h | 2 +- engine/vs_cubemap_gen/src/first.h | 2 +- engine/vs_cubemap_gen/src/fvector/fvector.h | 2 +- engine/vs_cubemap_gen/src/process/process.h | 2 +- engine/vs_cubemap_gen/src/settings/settings.h | 2 +- engine/vs_cubemap_gen/src/texture/mem_texture.h | 2 +- engine/vs_cubemap_gen/src/texture/mem_texture_impl/coords.h | 2 +- engine/vs_cubemap_gen/src/texture/mem_texture_impl/side.h | 2 +- engine/vs_cubemap_gen/src/texture/texture_settings.h | 2 +- engine/vs_cubemap_gen/src/units/units.h | 2 +- 453 files changed, 504 insertions(+), 449 deletions(-) diff --git a/engine/cmake-config.h.in b/engine/cmake-config.h.in index 02d857550d..95b7be8175 100644 --- a/engine/cmake-config.h.in +++ b/engine/cmake-config.h.in @@ -3,7 +3,7 @@ * * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors -* Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors +* Copyright (c) 2019-2023 Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike Contributors * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/launcher/general.h b/engine/launcher/general.h index 6fb4ac998c..b4b5b78014 100644 --- a/engine/launcher/general.h +++ b/engine/launcher/general.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2001-2022 Daniel Horn, David Ranger, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/launcher/resource.h b/engine/launcher/resource.h index 61f48a90a0..9cbb0d7ef5 100644 --- a/engine/launcher/resource.h +++ b/engine/launcher/resource.h @@ -3,7 +3,7 @@ * * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors -* Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors +* Copyright (c) 2019-2023 Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike Contributors * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/mission/include/central.h b/engine/mission/include/central.h index 24f056b936..e2c65a0591 100644 --- a/engine/mission/include/central.h +++ b/engine/mission/include/central.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, David Ranger, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, David Ranger, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/mission/include/display_gtk.h b/engine/mission/include/display_gtk.h index 82419e6f1d..f901d3f67f 100644 --- a/engine/mission/include/display_gtk.h +++ b/engine/mission/include/display_gtk.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, David Ranger, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, David Ranger, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/mission/include/easydom.h b/engine/mission/include/easydom.h index 2f0baa8af7..57f6e91ca0 100644 --- a/engine/mission/include/easydom.h +++ b/engine/mission/include/easydom.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Roy Falk, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Roy Falk, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/mission/include/file.h b/engine/mission/include/file.h index fbb708b3a6..4481119442 100644 --- a/engine/mission/include/file.h +++ b/engine/mission/include/file.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, David Ranger, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, David Ranger, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/mission/include/general.h b/engine/mission/include/general.h index 19b8d03e56..ee3c963358 100644 --- a/engine/mission/include/general.h +++ b/engine/mission/include/general.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, David Ranger, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, David Ranger, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/mission/include/hashtable.h b/engine/mission/include/hashtable.h index c193a4ca69..9e78d8f42f 100644 --- a/engine/mission/include/hashtable.h +++ b/engine/mission/include/hashtable.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Alan Shieh, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Alan Shieh, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/mission/include/xml_support.h b/engine/mission/include/xml_support.h index 6a95311579..46d45304ee 100644 --- a/engine/mission/include/xml_support.h +++ b/engine/mission/include/xml_support.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/objconv/basemaker/base_maker_texture.h b/engine/objconv/basemaker/base_maker_texture.h index 710c49bacb..c08f5247a6 100644 --- a/engine/objconv/basemaker/base_maker_texture.h +++ b/engine/objconv/basemaker/base_maker_texture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/objconv/basemaker/sprite.h b/engine/objconv/basemaker/sprite.h index 4ceb82288c..56fe296a8a 100644 --- a/engine/objconv/basemaker/sprite.h +++ b/engine/objconv/basemaker/sprite.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/objconv/mesher/Converter.h b/engine/objconv/mesher/Converter.h index f3553e85b3..03f46ea0ff 100644 --- a/engine/objconv/mesher/Converter.h +++ b/engine/objconv/mesher/Converter.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/objconv/mesher/PrecompiledHeaders/Converter.h b/engine/objconv/mesher/PrecompiledHeaders/Converter.h index 64514e8637..5e30fd96bd 100644 --- a/engine/objconv/mesher/PrecompiledHeaders/Converter.h +++ b/engine/objconv/mesher/PrecompiledHeaders/Converter.h @@ -3,7 +3,7 @@ * * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors -* Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors +* Copyright (c) 2019-2023 Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike Contributors * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/objconv/mesher/PrecompiledHeaders/Standard.h b/engine/objconv/mesher/PrecompiledHeaders/Standard.h index 23d80e7a07..20e0204ab2 100644 --- a/engine/objconv/mesher/PrecompiledHeaders/Standard.h +++ b/engine/objconv/mesher/PrecompiledHeaders/Standard.h @@ -3,7 +3,7 @@ * * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors -* Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors +* Copyright (c) 2019-2023 Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike Contributors * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/objconv/mesher/expat.h b/engine/objconv/mesher/expat.h index 41a195b0e0..cb7543d9a6 100644 --- a/engine/objconv/mesher/expat.h +++ b/engine/objconv/mesher/expat.h @@ -1,5 +1,6 @@ /* * Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd + * Copyright (c) 2023 Benjamen R. Meyer * See the file COPYING for copying permission. */ // NO HEADER GUARD -- 3rd Party diff --git a/engine/objconv/mesher/from_BFXM.h b/engine/objconv/mesher/from_BFXM.h index 1ad7f0db9a..08e536616f 100644 --- a/engine/objconv/mesher/from_BFXM.h +++ b/engine/objconv/mesher/from_BFXM.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/objconv/mesher/from_obj.h b/engine/objconv/mesher/from_obj.h index cce7c4621c..6b3566219b 100644 --- a/engine/objconv/mesher/from_obj.h +++ b/engine/objconv/mesher/from_obj.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/objconv/mesher/mesh.h b/engine/objconv/mesher/mesh.h index 49295ea064..9edad9ca06 100644 --- a/engine/objconv/mesher/mesh.h +++ b/engine/objconv/mesher/mesh.h @@ -3,7 +3,7 @@ * * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors -* Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors +* Copyright (c) 2019-2022 Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike Contributors * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/objconv/mesher/mesh_io.h b/engine/objconv/mesher/mesh_io.h index a935ab81aa..b4ff2eb0d7 100644 --- a/engine/objconv/mesher/mesh_io.h +++ b/engine/objconv/mesher/mesh_io.h @@ -3,7 +3,7 @@ * * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors -* Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors +* Copyright (c) 2019-2023 Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike Contributors * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/objconv/mesher/to_BFXM.h b/engine/objconv/mesher/to_BFXM.h index 33bdf9f618..0f7d435aae 100644 --- a/engine/objconv/mesher/to_BFXM.h +++ b/engine/objconv/mesher/to_BFXM.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/objconv/mesher/to_OgreMesh.h b/engine/objconv/mesher/to_OgreMesh.h index c3b4723e29..47def84321 100644 --- a/engine/objconv/mesher/to_OgreMesh.h +++ b/engine/objconv/mesher/to_OgreMesh.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/objconv/mesher/to_obj.h b/engine/objconv/mesher/to_obj.h index 597252d4a4..492407a707 100644 --- a/engine/objconv/mesher/to_obj.h +++ b/engine/objconv/mesher/to_obj.h @@ -3,7 +3,7 @@ * * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors -* Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors +* Copyright (c) 2019-2023 Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike Contributors * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/objconv/trisort.h b/engine/objconv/trisort.h index 2eb8f040f1..76dc7115f2 100644 --- a/engine/objconv/trisort.h +++ b/engine/objconv/trisort.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/setup/src/include/central.h b/engine/setup/src/include/central.h index 04f366a28b..3985484663 100644 --- a/engine/setup/src/include/central.h +++ b/engine/setup/src/include/central.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, David Ranger, pyramid3d, Stephen G. Tuggy, - * and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, David Ranger, pyramid3d, Stephen G. Tuggy, + * Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/setup/src/include/display.h b/engine/setup/src/include/display.h index 580d9adc9d..3b38ff84b2 100644 --- a/engine/setup/src/include/display.h +++ b/engine/setup/src/include/display.h @@ -6,8 +6,8 @@ */ /* - * Copyright (C) 2001-2022 Daniel Horn, David Ranger, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, David Ranger, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/setup/src/include/dont_link/display_console.h b/engine/setup/src/include/dont_link/display_console.h index eb00da7d50..e3e1f29084 100644 --- a/engine/setup/src/include/dont_link/display_console.h +++ b/engine/setup/src/include/dont_link/display_console.h @@ -2,7 +2,7 @@ * display_console.h - description * ---------------------------- * begin : January 18, 2002 - * copyright : (C) 2002 by David Ranger + * copyright : (C) 2002 by David Ranger, (C) 2023 by Benjamen R. Meyer * email : sabarok@start.com.au **************************************************************************/ diff --git a/engine/setup/src/include/file.h b/engine/setup/src/include/file.h index 5f9313634d..9f324dd131 100644 --- a/engine/setup/src/include/file.h +++ b/engine/setup/src/include/file.h @@ -2,7 +2,7 @@ * file.h - description * ---------------------------- * begin : January 18, 2002 - * copyright : (C) 2002 by David Ranger + * copyright : (C) 2002 by David Ranger, (C) 2023 By Benjamen R. Meyer * email : sabarok@start.com.au **************************************************************************/ diff --git a/engine/setup/src/include/general.h b/engine/setup/src/include/general.h index b56aea4d30..21080aaa37 100644 --- a/engine/setup/src/include/general.h +++ b/engine/setup/src/include/general.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, David Ranger, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, David Ranger, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/SharedPool.h b/engine/src/SharedPool.h index f506a2c28a..820e83017c 100644 --- a/engine/src/SharedPool.h +++ b/engine/src/SharedPool.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/Singleton.h b/engine/src/Singleton.h index c0ac7a48cc..d893fab38c 100644 --- a/engine/src/Singleton.h +++ b/engine/src/Singleton.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/XMLDocument.h b/engine/src/XMLDocument.h index 2204238ccc..26be09d94f 100644 --- a/engine/src/XMLDocument.h +++ b/engine/src/XMLDocument.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/abstract_config.h b/engine/src/abstract_config.h index 1322546dff..c5aad68e16 100644 --- a/engine/src/abstract_config.h +++ b/engine/src/abstract_config.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/aldrv/al_globals.h b/engine/src/aldrv/al_globals.h index ad2803f0a7..a7a5b8ce51 100644 --- a/engine/src/aldrv/al_globals.h +++ b/engine/src/aldrv/al_globals.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/atmospheric_fog_mesh.h b/engine/src/atmospheric_fog_mesh.h index c89f02f395..14b85c12ff 100644 --- a/engine/src/atmospheric_fog_mesh.h +++ b/engine/src/atmospheric_fog_mesh.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/audio/CodecRegistry.h b/engine/src/audio/CodecRegistry.h index 160ede72a1..92c3247e94 100644 --- a/engine/src/audio/CodecRegistry.h +++ b/engine/src/audio/CodecRegistry.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/Exceptions.h b/engine/src/audio/Exceptions.h index c4a6cf2f7c..60e627ee24 100644 --- a/engine/src/audio/Exceptions.h +++ b/engine/src/audio/Exceptions.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/Format.h b/engine/src/audio/Format.h index 26ddabbad7..aa56d348e2 100644 --- a/engine/src/audio/Format.h +++ b/engine/src/audio/Format.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/Listener.h b/engine/src/audio/Listener.h index 6ec4592236..a55b3a8bd0 100644 --- a/engine/src/audio/Listener.h +++ b/engine/src/audio/Listener.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/Matrix.h b/engine/src/audio/Matrix.h index 5d3a9fcd95..02c34de4bd 100644 --- a/engine/src/audio/Matrix.h +++ b/engine/src/audio/Matrix.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/RenderableListener.h b/engine/src/audio/RenderableListener.h index 1644e02aa2..8a0466d732 100644 --- a/engine/src/audio/RenderableListener.h +++ b/engine/src/audio/RenderableListener.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/RenderableSource.h b/engine/src/audio/RenderableSource.h index ec60866018..25399f918a 100644 --- a/engine/src/audio/RenderableSource.h +++ b/engine/src/audio/RenderableSource.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/Renderer.h b/engine/src/audio/Renderer.h index 220ea9a0fc..f07d4c0bb5 100644 --- a/engine/src/audio/Renderer.h +++ b/engine/src/audio/Renderer.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/Scene.h b/engine/src/audio/Scene.h index 6a0afa0943..ffc2971e29 100644 --- a/engine/src/audio/Scene.h +++ b/engine/src/audio/Scene.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/SceneManager.h b/engine/src/audio/SceneManager.h index 201ecfd3dd..179f7f5c51 100644 --- a/engine/src/audio/SceneManager.h +++ b/engine/src/audio/SceneManager.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/SimpleScene.h b/engine/src/audio/SimpleScene.h index 94fe720518..c5d0ed4a69 100644 --- a/engine/src/audio/SimpleScene.h +++ b/engine/src/audio/SimpleScene.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/SimpleSound.h b/engine/src/audio/SimpleSound.h index cc294f54d8..7d93658357 100644 --- a/engine/src/audio/SimpleSound.h +++ b/engine/src/audio/SimpleSound.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/SimpleSource.h b/engine/src/audio/SimpleSource.h index f428f3265c..8915f76f31 100644 --- a/engine/src/audio/SimpleSource.h +++ b/engine/src/audio/SimpleSource.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/Sound.h b/engine/src/audio/Sound.h index d0bbd84ddf..ecdd7ad435 100644 --- a/engine/src/audio/Sound.h +++ b/engine/src/audio/Sound.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/SoundBuffer.h b/engine/src/audio/SoundBuffer.h index 6281317c00..019aae4adb 100644 --- a/engine/src/audio/SoundBuffer.h +++ b/engine/src/audio/SoundBuffer.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/Source.h b/engine/src/audio/Source.h index df0b1d908f..13ae4d53e4 100644 --- a/engine/src/audio/Source.h +++ b/engine/src/audio/Source.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/SourceListener.h b/engine/src/audio/SourceListener.h index 711fd34073..b223a79532 100644 --- a/engine/src/audio/SourceListener.h +++ b/engine/src/audio/SourceListener.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/SourceTemplate.h b/engine/src/audio/SourceTemplate.h index 1812602084..9c9ece0309 100644 --- a/engine/src/audio/SourceTemplate.h +++ b/engine/src/audio/SourceTemplate.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/Stream.h b/engine/src/audio/Stream.h index f64959af61..5d17ca93c6 100644 --- a/engine/src/audio/Stream.h +++ b/engine/src/audio/Stream.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/Types.h b/engine/src/audio/Types.h index faf6c5f259..3787767b49 100644 --- a/engine/src/audio/Types.h +++ b/engine/src/audio/Types.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/Vector.h b/engine/src/audio/Vector.h index f746040eee..db7e561bbe 100644 --- a/engine/src/audio/Vector.h +++ b/engine/src/audio/Vector.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/VirtualIterator.h b/engine/src/audio/VirtualIterator.h index 122c23dd75..c80f725a9d 100644 --- a/engine/src/audio/VirtualIterator.h +++ b/engine/src/audio/VirtualIterator.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/codecs/Codec.h b/engine/src/audio/codecs/Codec.h index a0cced3c36..63f84fad85 100644 --- a/engine/src/audio/codecs/Codec.h +++ b/engine/src/audio/codecs/Codec.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/codecs/FFCodec.h b/engine/src/audio/codecs/FFCodec.h index a50e4a4f94..fac62a806d 100644 --- a/engine/src/audio/codecs/FFCodec.h +++ b/engine/src/audio/codecs/FFCodec.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/codecs/FFStream.h b/engine/src/audio/codecs/FFStream.h index 2f173c8bf4..4722550d9c 100644 --- a/engine/src/audio/codecs/FFStream.h +++ b/engine/src/audio/codecs/FFStream.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/codecs/OggCodec.h b/engine/src/audio/codecs/OggCodec.h index 8c2b76a02e..685d202f13 100644 --- a/engine/src/audio/codecs/OggCodec.h +++ b/engine/src/audio/codecs/OggCodec.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/codecs/OggData.h b/engine/src/audio/codecs/OggData.h index d14cc9f6a1..e76139edb9 100644 --- a/engine/src/audio/codecs/OggData.h +++ b/engine/src/audio/codecs/OggData.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/codecs/OggStream.h b/engine/src/audio/codecs/OggStream.h index 4c9d4f2d5b..4636da94a2 100644 --- a/engine/src/audio/codecs/OggStream.h +++ b/engine/src/audio/codecs/OggStream.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/renderers/OpenAL/BorrowedOpenALRenderer.h b/engine/src/audio/renderers/OpenAL/BorrowedOpenALRenderer.h index 348cbe6b0d..e0a82d630d 100644 --- a/engine/src/audio/renderers/OpenAL/BorrowedOpenALRenderer.h +++ b/engine/src/audio/renderers/OpenAL/BorrowedOpenALRenderer.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/renderers/OpenAL/OpenALHelpers.h b/engine/src/audio/renderers/OpenAL/OpenALHelpers.h index 6c83ede753..7489a105aa 100644 --- a/engine/src/audio/renderers/OpenAL/OpenALHelpers.h +++ b/engine/src/audio/renderers/OpenAL/OpenALHelpers.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/renderers/OpenAL/OpenALRenderableListener.h b/engine/src/audio/renderers/OpenAL/OpenALRenderableListener.h index 5e0577ce9c..18fcd2318d 100644 --- a/engine/src/audio/renderers/OpenAL/OpenALRenderableListener.h +++ b/engine/src/audio/renderers/OpenAL/OpenALRenderableListener.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/renderers/OpenAL/OpenALRenderableSource.h b/engine/src/audio/renderers/OpenAL/OpenALRenderableSource.h index f15bbb3a1e..1c00c27f7c 100644 --- a/engine/src/audio/renderers/OpenAL/OpenALRenderableSource.h +++ b/engine/src/audio/renderers/OpenAL/OpenALRenderableSource.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/renderers/OpenAL/OpenALRenderableStreamingSource.h b/engine/src/audio/renderers/OpenAL/OpenALRenderableStreamingSource.h index 1aafe9dd17..4eb101bf24 100644 --- a/engine/src/audio/renderers/OpenAL/OpenALRenderableStreamingSource.h +++ b/engine/src/audio/renderers/OpenAL/OpenALRenderableStreamingSource.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/renderers/OpenAL/OpenALRenderer.h b/engine/src/audio/renderers/OpenAL/OpenALRenderer.h index cd1f811b64..8cc8edb5a3 100644 --- a/engine/src/audio/renderers/OpenAL/OpenALRenderer.h +++ b/engine/src/audio/renderers/OpenAL/OpenALRenderer.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/renderers/OpenAL/OpenALSimpleSound.h b/engine/src/audio/renderers/OpenAL/OpenALSimpleSound.h index a0fa7ab617..1e2f698a06 100644 --- a/engine/src/audio/renderers/OpenAL/OpenALSimpleSound.h +++ b/engine/src/audio/renderers/OpenAL/OpenALSimpleSound.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/renderers/OpenAL/OpenALStreamingSound.h b/engine/src/audio/renderers/OpenAL/OpenALStreamingSound.h index 8e28fd82f8..8b39a47d18 100644 --- a/engine/src/audio/renderers/OpenAL/OpenALStreamingSound.h +++ b/engine/src/audio/renderers/OpenAL/OpenALStreamingSound.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/renderers/OpenAL/al.h b/engine/src/audio/renderers/OpenAL/al.h index 2678a1a85f..22d34bced0 100644 --- a/engine/src/audio/renderers/OpenAL/al.h +++ b/engine/src/audio/renderers/OpenAL/al.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/test.h b/engine/src/audio/test.h index e093f71dcb..cb7efd372f 100644 --- a/engine/src/audio/test.h +++ b/engine/src/audio/test.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audio/utils.h b/engine/src/audio/utils.h index eb303c6ec5..eddef368db 100644 --- a/engine/src/audio/utils.h +++ b/engine/src/audio/utils.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/audiolib.h b/engine/src/audiolib.h index 869ebc9cb5..6fc248cb93 100644 --- a/engine/src/audiolib.h +++ b/engine/src/audiolib.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/cg_global.h b/engine/src/cg_global.h index 8f7a6e1446..a21cfd01ba 100644 --- a/engine/src/cg_global.h +++ b/engine/src/cg_global.h @@ -3,7 +3,7 @@ * * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike contributors - * Copyright (C) 2021 Stephen G. Tuggy + * Copyright (C) 2021-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/ai/aggressive.h b/engine/src/cmd/ai/aggressive.h index 4956b11eb5..72cea00e27 100644 --- a/engine/src/cmd/ai/aggressive.h +++ b/engine/src/cmd/ai/aggressive.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/ai/autodocking.h b/engine/src/cmd/ai/autodocking.h index 0f2d352ea3..86b0bf564b 100644 --- a/engine/src/cmd/ai/autodocking.h +++ b/engine/src/cmd/ai/autodocking.h @@ -5,7 +5,7 @@ * Copyright (C) 2001-2002 Daniel Horn * Copyright (C) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (C) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/ai/comm_ai.h b/engine/src/cmd/ai/comm_ai.h index 7b5a62adba..8f3704b689 100644 --- a/engine/src/cmd/ai/comm_ai.h +++ b/engine/src/cmd/ai/comm_ai.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/ai/communication.h b/engine/src/cmd/ai/communication.h index aa31ec28f2..e065ed8b66 100644 --- a/engine/src/cmd/ai/communication.h +++ b/engine/src/cmd/ai/communication.h @@ -3,7 +3,7 @@ * * Copyright (C) 2001-2002 Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike contributors - * Copyright (C) 2021-2022 Stephen G. Tuggy + * Copyright (C) 2021-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/ai/docking.h b/engine/src/cmd/ai/docking.h index fd6346e4da..cdceb3d087 100644 --- a/engine/src/cmd/ai/docking.h +++ b/engine/src/cmd/ai/docking.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/ai/event_xml.h b/engine/src/cmd/ai/event_xml.h index da3e7106e2..65b13c7cb1 100644 --- a/engine/src/cmd/ai/event_xml.h +++ b/engine/src/cmd/ai/event_xml.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/ai/fire.h b/engine/src/cmd/ai/fire.h index e6755a30e6..34930bb792 100644 --- a/engine/src/cmd/ai/fire.h +++ b/engine/src/cmd/ai/fire.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/ai/fireall.h b/engine/src/cmd/ai/fireall.h index 71ff1e835f..b658aa0674 100644 --- a/engine/src/cmd/ai/fireall.h +++ b/engine/src/cmd/ai/fireall.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/ai/firekeyboard.h b/engine/src/cmd/ai/firekeyboard.h index 2ef5be8152..94c1431cbc 100644 --- a/engine/src/cmd/ai/firekeyboard.h +++ b/engine/src/cmd/ai/firekeyboard.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/ai/flybywire.h b/engine/src/cmd/ai/flybywire.h index 14f13c66ed..80a382471c 100644 --- a/engine/src/cmd/ai/flybywire.h +++ b/engine/src/cmd/ai/flybywire.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/ai/flyjoystick.h b/engine/src/cmd/ai/flyjoystick.h index e6a82536d2..c981ff3b7a 100644 --- a/engine/src/cmd/ai/flyjoystick.h +++ b/engine/src/cmd/ai/flyjoystick.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/ai/flykeyboard.h b/engine/src/cmd/ai/flykeyboard.h index 40cc81d84c..dcde8f78fe 100644 --- a/engine/src/cmd/ai/flykeyboard.h +++ b/engine/src/cmd/ai/flykeyboard.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/ai/hard_coded_scripts.h b/engine/src/cmd/ai/hard_coded_scripts.h index 660454e7e4..57fcb4d130 100644 --- a/engine/src/cmd/ai/hard_coded_scripts.h +++ b/engine/src/cmd/ai/hard_coded_scripts.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/ai/ikarus.h b/engine/src/cmd/ai/ikarus.h index ddcba681c9..bc04878f3f 100644 --- a/engine/src/cmd/ai/ikarus.h +++ b/engine/src/cmd/ai/ikarus.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/ai/missionscript.h b/engine/src/cmd/ai/missionscript.h index 908e84e0c9..8f2a78c365 100644 --- a/engine/src/cmd/ai/missionscript.h +++ b/engine/src/cmd/ai/missionscript.h @@ -4,7 +4,7 @@ * Copyright (C) 2001-2002 Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/ai/navigation.h b/engine/src/cmd/ai/navigation.h index 2b67c7850f..b03f9b8558 100644 --- a/engine/src/cmd/ai/navigation.h +++ b/engine/src/cmd/ai/navigation.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/ai/order.h b/engine/src/cmd/ai/order.h index 4a47df0e52..247b8ed700 100644 --- a/engine/src/cmd/ai/order.h +++ b/engine/src/cmd/ai/order.h @@ -4,7 +4,7 @@ * Copyright (C) 2001-2002 Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/ai/pythonai.h b/engine/src/cmd/ai/pythonai.h index 2a968879ee..52b5278dcd 100644 --- a/engine/src/cmd/ai/pythonai.h +++ b/engine/src/cmd/ai/pythonai.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/ai/script.h b/engine/src/cmd/ai/script.h index 2351c10eda..8a873e4283 100644 --- a/engine/src/cmd/ai/script.h +++ b/engine/src/cmd/ai/script.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/ai/tactics.h b/engine/src/cmd/ai/tactics.h index 57e1626030..373ca75da9 100644 --- a/engine/src/cmd/ai/tactics.h +++ b/engine/src/cmd/ai/tactics.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/ai/turretai.h b/engine/src/cmd/ai/turretai.h index 9763717640..6bd371d43c 100644 --- a/engine/src/cmd/ai/turretai.h +++ b/engine/src/cmd/ai/turretai.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/ai/warpto.h b/engine/src/cmd/ai/warpto.h index 1551b8f69c..0eaa0c459b 100644 --- a/engine/src/cmd/ai/warpto.h +++ b/engine/src/cmd/ai/warpto.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/alphacurve.h b/engine/src/cmd/alphacurve.h index b82590691e..f6c6e3b042 100644 --- a/engine/src/cmd/alphacurve.h +++ b/engine/src/cmd/alphacurve.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/cmd/armed.h b/engine/src/cmd/armed.h index 2749d097e2..56f57af709 100644 --- a/engine/src/cmd/armed.h +++ b/engine/src/cmd/armed.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/asteroid.h b/engine/src/cmd/asteroid.h index 06eaa7e924..18a82a64f0 100644 --- a/engine/src/cmd/asteroid.h +++ b/engine/src/cmd/asteroid.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/atmosphere.h b/engine/src/cmd/atmosphere.h index f938004927..00be5b9329 100644 --- a/engine/src/cmd/atmosphere.h +++ b/engine/src/cmd/atmosphere.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/audible.h b/engine/src/cmd/audible.h index 3a6bfe7ad4..f21baf9015 100644 --- a/engine/src/cmd/audible.h +++ b/engine/src/cmd/audible.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/base.h b/engine/src/cmd/base.h index ddc10cb653..1d7e8c4392 100644 --- a/engine/src/cmd/base.h +++ b/engine/src/cmd/base.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/base_util.h b/engine/src/cmd/base_util.h index 7216037dd8..0eb1a70fd3 100644 --- a/engine/src/cmd/base_util.h +++ b/engine/src/cmd/base_util.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/basecomputer.h b/engine/src/cmd/basecomputer.h index 48b06b0f22..d64bdff48d 100644 --- a/engine/src/cmd/basecomputer.h +++ b/engine/src/cmd/basecomputer.h @@ -4,7 +4,7 @@ * Copyright (C) 2003 Mike Byron * Copyright (C) 2019-2020 Stephen G. Tuggy, pyramid3d, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/beam.h b/engine/src/cmd/beam.h index afa4c9f1c0..5d55ff36a4 100644 --- a/engine/src/cmd/beam.h +++ b/engine/src/cmd/beam.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/bolt.h b/engine/src/cmd/bolt.h index 96e7a841eb..262bb19f6f 100644 --- a/engine/src/cmd/bolt.h +++ b/engine/src/cmd/bolt.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/briefing.h b/engine/src/cmd/briefing.h index f913eee10f..c9e389ed83 100644 --- a/engine/src/cmd/briefing.h +++ b/engine/src/cmd/briefing.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/building.h b/engine/src/cmd/building.h index 025c211374..e469e81327 100644 --- a/engine/src/cmd/building.h +++ b/engine/src/cmd/building.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/cargo.h b/engine/src/cmd/cargo.h index bfcef54034..626fe94bff 100644 --- a/engine/src/cmd/cargo.h +++ b/engine/src/cmd/cargo.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/carrier.h b/engine/src/cmd/carrier.h index 5034cb94cf..7cd35de844 100644 --- a/engine/src/cmd/carrier.h +++ b/engine/src/cmd/carrier.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/click_list.h b/engine/src/cmd/click_list.h index eeeca197cb..1255f18651 100644 --- a/engine/src/cmd/click_list.h +++ b/engine/src/cmd/click_list.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/collection.h b/engine/src/cmd/collection.h index 0af0387415..b6e5e7fb83 100644 --- a/engine/src/cmd/collection.h +++ b/engine/src/cmd/collection.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/collide.h b/engine/src/cmd/collide.h index 205080c5f5..43893d8c53 100644 --- a/engine/src/cmd/collide.h +++ b/engine/src/cmd/collide.h @@ -3,7 +3,7 @@ * * Copyright (C) 2020 Roy Falk, Stephen G. Tuggy and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/collide2/CSopcodecollider.h b/engine/src/cmd/collide2/CSopcodecollider.h index e5e20b70f1..e7c58f4898 100644 --- a/engine/src/cmd/collide2/CSopcodecollider.h +++ b/engine/src/cmd/collide2/CSopcodecollider.h @@ -26,7 +26,7 @@ /* * Copyright (C) 2020 pyramid3d - * Copyright (C) 2020-2022 Stephen G. Tuggy + * Copyright (C) 2020-2023 Stephen G. Tuggy, Benjamen R. Meyer */ #ifndef VEGA_STRIKE_ENGINE_CMD_COLLSION2_OPCODECOL_H diff --git a/engine/src/cmd/collide2/Ice/IceAABB.h b/engine/src/cmd/collide2/Ice/IceAABB.h index 82dd9db4dc..bc37cb4ae1 100644 --- a/engine/src/cmd/collide2/Ice/IceAABB.h +++ b/engine/src/cmd/collide2/Ice/IceAABB.h @@ -11,6 +11,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/Ice/IceAxes.h b/engine/src/cmd/collide2/Ice/IceAxes.h index bb3f334971..8ac6fbff68 100644 --- a/engine/src/cmd/collide2/Ice/IceAxes.h +++ b/engine/src/cmd/collide2/Ice/IceAxes.h @@ -11,6 +11,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/Ice/IceBoundingSphere.h b/engine/src/cmd/collide2/Ice/IceBoundingSphere.h index 6a459ab1ff..934f728325 100644 --- a/engine/src/cmd/collide2/Ice/IceBoundingSphere.h +++ b/engine/src/cmd/collide2/Ice/IceBoundingSphere.h @@ -11,6 +11,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/Ice/IceContainer.h b/engine/src/cmd/collide2/Ice/IceContainer.h index a22a3ef2ac..d93f80b696 100644 --- a/engine/src/cmd/collide2/Ice/IceContainer.h +++ b/engine/src/cmd/collide2/Ice/IceContainer.h @@ -11,6 +11,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/Ice/IceFPU.h b/engine/src/cmd/collide2/Ice/IceFPU.h index 37043f43e9..ccbd9852e8 100644 --- a/engine/src/cmd/collide2/Ice/IceFPU.h +++ b/engine/src/cmd/collide2/Ice/IceFPU.h @@ -7,6 +7,7 @@ * * Updated by Stephen G. Tuggy 2021-07-07 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/Ice/IceHPoint.h b/engine/src/cmd/collide2/Ice/IceHPoint.h index 9119b020cd..fa3f08a062 100644 --- a/engine/src/cmd/collide2/Ice/IceHPoint.h +++ b/engine/src/cmd/collide2/Ice/IceHPoint.h @@ -6,6 +6,7 @@ * \date April, 4, 2000 * * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/Ice/IceIndexedTriangle.h b/engine/src/cmd/collide2/Ice/IceIndexedTriangle.h index ae6d2bc52b..322271defc 100644 --- a/engine/src/cmd/collide2/Ice/IceIndexedTriangle.h +++ b/engine/src/cmd/collide2/Ice/IceIndexedTriangle.h @@ -11,6 +11,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-027 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/Ice/IceLSS.h b/engine/src/cmd/collide2/Ice/IceLSS.h index 8178a95015..16054b6b45 100644 --- a/engine/src/cmd/collide2/Ice/IceLSS.h +++ b/engine/src/cmd/collide2/Ice/IceLSS.h @@ -6,6 +6,7 @@ * \date April, 4, 2000 * * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/Ice/IceMatrix3x3.h b/engine/src/cmd/collide2/Ice/IceMatrix3x3.h index a0b66a1bdb..3e1177feb4 100644 --- a/engine/src/cmd/collide2/Ice/IceMatrix3x3.h +++ b/engine/src/cmd/collide2/Ice/IceMatrix3x3.h @@ -11,6 +11,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/Ice/IceMatrix4x4.h b/engine/src/cmd/collide2/Ice/IceMatrix4x4.h index da32a823c1..08f725b1bf 100644 --- a/engine/src/cmd/collide2/Ice/IceMatrix4x4.h +++ b/engine/src/cmd/collide2/Ice/IceMatrix4x4.h @@ -11,6 +11,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/Ice/IceMemoryMacros.h b/engine/src/cmd/collide2/Ice/IceMemoryMacros.h index 2dae1bb375..e971ec0aa6 100644 --- a/engine/src/cmd/collide2/Ice/IceMemoryMacros.h +++ b/engine/src/cmd/collide2/Ice/IceMemoryMacros.h @@ -7,6 +7,7 @@ * * Updated by Stephen G. Tuggy 2021-07-07 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/Ice/IceOBB.h b/engine/src/cmd/collide2/Ice/IceOBB.h index da8d63a162..495a71db91 100644 --- a/engine/src/cmd/collide2/Ice/IceOBB.h +++ b/engine/src/cmd/collide2/Ice/IceOBB.h @@ -11,6 +11,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/Ice/IcePairs.h b/engine/src/cmd/collide2/Ice/IcePairs.h index 50b2b2fa7c..cf1ffad094 100644 --- a/engine/src/cmd/collide2/Ice/IcePairs.h +++ b/engine/src/cmd/collide2/Ice/IcePairs.h @@ -11,6 +11,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/Ice/IcePlane.h b/engine/src/cmd/collide2/Ice/IcePlane.h index 680626e0cb..063ba9d578 100644 --- a/engine/src/cmd/collide2/Ice/IcePlane.h +++ b/engine/src/cmd/collide2/Ice/IcePlane.h @@ -6,6 +6,7 @@ * \date April, 4, 2000 * * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/Ice/IcePoint.h b/engine/src/cmd/collide2/Ice/IcePoint.h index d4570fcde5..e4af564fb5 100644 --- a/engine/src/cmd/collide2/Ice/IcePoint.h +++ b/engine/src/cmd/collide2/Ice/IcePoint.h @@ -8,7 +8,7 @@ * Copyright (C) 2000 Pierre Terdiman * Copyright (C) 2020 pyramid3d, LifWirser, Benjamen Meyer, Stephen G. Tuggy, * and other Vega Strike contributors. - * Copyright (C) 2021-2022 Stephen G. Tuggy + * Copyright (C) 2021-2023 Stephen G. Tuggy, Benjamen R. Meyer * * This file is part of Vega Strike. * diff --git a/engine/src/cmd/collide2/Ice/IcePreprocessor.h b/engine/src/cmd/collide2/Ice/IcePreprocessor.h index 0b68061d8b..bba09d6887 100644 --- a/engine/src/cmd/collide2/Ice/IcePreprocessor.h +++ b/engine/src/cmd/collide2/Ice/IcePreprocessor.h @@ -6,6 +6,7 @@ * \date April, 4, 2000 * * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/Ice/IceRandom.h b/engine/src/cmd/collide2/Ice/IceRandom.h index 3cd439302a..fec59a31ad 100644 --- a/engine/src/cmd/collide2/Ice/IceRandom.h +++ b/engine/src/cmd/collide2/Ice/IceRandom.h @@ -11,6 +11,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/Ice/IceRay.h b/engine/src/cmd/collide2/Ice/IceRay.h index 749c77e05a..63aed3b805 100644 --- a/engine/src/cmd/collide2/Ice/IceRay.h +++ b/engine/src/cmd/collide2/Ice/IceRay.h @@ -11,6 +11,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/Ice/IceRevisitedRadix.h b/engine/src/cmd/collide2/Ice/IceRevisitedRadix.h index 19f5c764f7..bd95ed6652 100644 --- a/engine/src/cmd/collide2/Ice/IceRevisitedRadix.h +++ b/engine/src/cmd/collide2/Ice/IceRevisitedRadix.h @@ -11,6 +11,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/Ice/IceSegment.h b/engine/src/cmd/collide2/Ice/IceSegment.h index d0e9ad5cfc..a02ab6cb54 100644 --- a/engine/src/cmd/collide2/Ice/IceSegment.h +++ b/engine/src/cmd/collide2/Ice/IceSegment.h @@ -11,6 +11,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/Ice/IceTriangle.h b/engine/src/cmd/collide2/Ice/IceTriangle.h index 80360eb90e..e9a74c8c3b 100644 --- a/engine/src/cmd/collide2/Ice/IceTriangle.h +++ b/engine/src/cmd/collide2/Ice/IceTriangle.h @@ -11,6 +11,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/Ice/IceTrilist.h b/engine/src/cmd/collide2/Ice/IceTrilist.h index e095086d8d..f045490e41 100644 --- a/engine/src/cmd/collide2/Ice/IceTrilist.h +++ b/engine/src/cmd/collide2/Ice/IceTrilist.h @@ -11,6 +11,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/Ice/IceTypes.h b/engine/src/cmd/collide2/Ice/IceTypes.h index 2f22131be9..7225d7ea38 100644 --- a/engine/src/cmd/collide2/Ice/IceTypes.h +++ b/engine/src/cmd/collide2/Ice/IceTypes.h @@ -11,6 +11,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/Ice/IceUtils.h b/engine/src/cmd/collide2/Ice/IceUtils.h index 143bdaf6a0..2b5990a01b 100644 --- a/engine/src/cmd/collide2/Ice/IceUtils.h +++ b/engine/src/cmd/collide2/Ice/IceUtils.h @@ -11,6 +11,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/OPC_AABBCollider.h b/engine/src/cmd/collide2/OPC_AABBCollider.h index 1717979009..6a8a45d245 100644 --- a/engine/src/cmd/collide2/OPC_AABBCollider.h +++ b/engine/src/cmd/collide2/OPC_AABBCollider.h @@ -14,6 +14,7 @@ * \date January, 1st, 2002 * * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/OPC_AABBTree.h b/engine/src/cmd/collide2/OPC_AABBTree.h index 56c2a854be..6a53bc7d5f 100644 --- a/engine/src/cmd/collide2/OPC_AABBTree.h +++ b/engine/src/cmd/collide2/OPC_AABBTree.h @@ -19,6 +19,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/OPC_BaseModel.h b/engine/src/cmd/collide2/OPC_BaseModel.h index a1e8b5592a..01f708bf83 100644 --- a/engine/src/cmd/collide2/OPC_BaseModel.h +++ b/engine/src/cmd/collide2/OPC_BaseModel.h @@ -19,6 +19,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/OPC_BoxBoxOverlap.h b/engine/src/cmd/collide2/OPC_BoxBoxOverlap.h index df6bab2e97..7811e1a2cd 100644 --- a/engine/src/cmd/collide2/OPC_BoxBoxOverlap.h +++ b/engine/src/cmd/collide2/OPC_BoxBoxOverlap.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/cmd/collide2/OPC_BoxPruning.h b/engine/src/cmd/collide2/OPC_BoxPruning.h index dc05d64c2a..6d90993c50 100644 --- a/engine/src/cmd/collide2/OPC_BoxPruning.h +++ b/engine/src/cmd/collide2/OPC_BoxPruning.h @@ -19,6 +19,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/OPC_Collider.h b/engine/src/cmd/collide2/OPC_Collider.h index 8ceb772140..e358274f1a 100644 --- a/engine/src/cmd/collide2/OPC_Collider.h +++ b/engine/src/cmd/collide2/OPC_Collider.h @@ -19,6 +19,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/OPC_Common.h b/engine/src/cmd/collide2/OPC_Common.h index de1a969872..71af016308 100644 --- a/engine/src/cmd/collide2/OPC_Common.h +++ b/engine/src/cmd/collide2/OPC_Common.h @@ -19,6 +19,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/OPC_HybridModel.h b/engine/src/cmd/collide2/OPC_HybridModel.h index 23f7451b08..f2020382a3 100644 --- a/engine/src/cmd/collide2/OPC_HybridModel.h +++ b/engine/src/cmd/collide2/OPC_HybridModel.h @@ -19,6 +19,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/OPC_LSSCollider.h b/engine/src/cmd/collide2/OPC_LSSCollider.h index 9f4b4d82ef..2cea70b696 100644 --- a/engine/src/cmd/collide2/OPC_LSSCollider.h +++ b/engine/src/cmd/collide2/OPC_LSSCollider.h @@ -19,6 +19,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/OPC_MeshInterface.h b/engine/src/cmd/collide2/OPC_MeshInterface.h index 12b5ead380..ceb9727d5b 100644 --- a/engine/src/cmd/collide2/OPC_MeshInterface.h +++ b/engine/src/cmd/collide2/OPC_MeshInterface.h @@ -19,6 +19,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/OPC_Model.h b/engine/src/cmd/collide2/OPC_Model.h index aa34b7907b..a5a9deccbd 100644 --- a/engine/src/cmd/collide2/OPC_Model.h +++ b/engine/src/cmd/collide2/OPC_Model.h @@ -19,6 +19,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/OPC_OBBCollider.h b/engine/src/cmd/collide2/OPC_OBBCollider.h index d962ffd7b9..9102ccce8d 100644 --- a/engine/src/cmd/collide2/OPC_OBBCollider.h +++ b/engine/src/cmd/collide2/OPC_OBBCollider.h @@ -19,6 +19,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/OPC_OptimizedTree.h b/engine/src/cmd/collide2/OPC_OptimizedTree.h index fd3337aa1a..d404d9bedf 100644 --- a/engine/src/cmd/collide2/OPC_OptimizedTree.h +++ b/engine/src/cmd/collide2/OPC_OptimizedTree.h @@ -19,6 +19,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/OPC_Picking.h b/engine/src/cmd/collide2/OPC_Picking.h index 85e1156f19..6de6fc5ada 100644 --- a/engine/src/cmd/collide2/OPC_Picking.h +++ b/engine/src/cmd/collide2/OPC_Picking.h @@ -19,6 +19,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/OPC_PlanesAABBOverlap.h b/engine/src/cmd/collide2/OPC_PlanesAABBOverlap.h index 3ee77ab60c..d7bd3650ef 100644 --- a/engine/src/cmd/collide2/OPC_PlanesAABBOverlap.h +++ b/engine/src/cmd/collide2/OPC_PlanesAABBOverlap.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/cmd/collide2/OPC_PlanesCollider.h b/engine/src/cmd/collide2/OPC_PlanesCollider.h index 4e5f9f66d9..ca1e0bdccb 100644 --- a/engine/src/cmd/collide2/OPC_PlanesCollider.h +++ b/engine/src/cmd/collide2/OPC_PlanesCollider.h @@ -19,6 +19,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/OPC_PlanesTriOverlap.h b/engine/src/cmd/collide2/OPC_PlanesTriOverlap.h index 5a9318ce91..6b88b9bc62 100644 --- a/engine/src/cmd/collide2/OPC_PlanesTriOverlap.h +++ b/engine/src/cmd/collide2/OPC_PlanesTriOverlap.h @@ -2,6 +2,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // NO HEADER GUARD diff --git a/engine/src/cmd/collide2/OPC_RayCollider.h b/engine/src/cmd/collide2/OPC_RayCollider.h index b9734d778c..3018002295 100644 --- a/engine/src/cmd/collide2/OPC_RayCollider.h +++ b/engine/src/cmd/collide2/OPC_RayCollider.h @@ -19,6 +19,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/OPC_Settings.h b/engine/src/cmd/collide2/OPC_Settings.h index 557c35b260..0f4e9cec27 100644 --- a/engine/src/cmd/collide2/OPC_Settings.h +++ b/engine/src/cmd/collide2/OPC_Settings.h @@ -14,6 +14,7 @@ * \date May, 12, 2001 * * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/OPC_SphereAABBOverlap.h b/engine/src/cmd/collide2/OPC_SphereAABBOverlap.h index 6d49cf8bbd..33451ece04 100644 --- a/engine/src/cmd/collide2/OPC_SphereAABBOverlap.h +++ b/engine/src/cmd/collide2/OPC_SphereAABBOverlap.h @@ -2,6 +2,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // NO HEADER GUARD diff --git a/engine/src/cmd/collide2/OPC_SphereCollider.h b/engine/src/cmd/collide2/OPC_SphereCollider.h index 1ecd71215b..01a52b9de2 100644 --- a/engine/src/cmd/collide2/OPC_SphereCollider.h +++ b/engine/src/cmd/collide2/OPC_SphereCollider.h @@ -19,6 +19,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/OPC_SweepAndPrune.h b/engine/src/cmd/collide2/OPC_SweepAndPrune.h index c2443cd245..717c85673d 100644 --- a/engine/src/cmd/collide2/OPC_SweepAndPrune.h +++ b/engine/src/cmd/collide2/OPC_SweepAndPrune.h @@ -19,6 +19,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/OPC_TreeBuilders.h b/engine/src/cmd/collide2/OPC_TreeBuilders.h index d2cd31430f..9e0a931e1a 100644 --- a/engine/src/cmd/collide2/OPC_TreeBuilders.h +++ b/engine/src/cmd/collide2/OPC_TreeBuilders.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Pierre Terdiman, Daniel Horn, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Pierre Terdiman, Daniel Horn, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/collide2/OPC_TreeCollider.h b/engine/src/cmd/collide2/OPC_TreeCollider.h index 8e68c62d0f..bac375b84d 100644 --- a/engine/src/cmd/collide2/OPC_TreeCollider.h +++ b/engine/src/cmd/collide2/OPC_TreeCollider.h @@ -19,6 +19,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/OPC_TriBoxOverlap.h b/engine/src/cmd/collide2/OPC_TriBoxOverlap.h index c23060706e..22fed1608a 100644 --- a/engine/src/cmd/collide2/OPC_TriBoxOverlap.h +++ b/engine/src/cmd/collide2/OPC_TriBoxOverlap.h @@ -2,6 +2,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // NO HEADER GUARD diff --git a/engine/src/cmd/collide2/OPC_TriTriOverlap.h b/engine/src/cmd/collide2/OPC_TriTriOverlap.h index 0133d81aa6..947bd7e3fd 100644 --- a/engine/src/cmd/collide2/OPC_TriTriOverlap.h +++ b/engine/src/cmd/collide2/OPC_TriTriOverlap.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Pierre Terdiman, Daniel Horn, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Pierre Terdiman, Daniel Horn, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/collide2/OPC_VolumeCollider.h b/engine/src/cmd/collide2/OPC_VolumeCollider.h index a97d93e458..1a636b6488 100644 --- a/engine/src/cmd/collide2/OPC_VolumeCollider.h +++ b/engine/src/cmd/collide2/OPC_VolumeCollider.h @@ -19,6 +19,7 @@ /** * Updated by Stephen G. Tuggy 2021-07-03 * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/Opcode.h b/engine/src/cmd/collide2/Opcode.h index 3a3f73cb67..ad5c391843 100644 --- a/engine/src/cmd/collide2/Opcode.h +++ b/engine/src/cmd/collide2/Opcode.h @@ -31,6 +31,7 @@ * \date March, 20, 2001 * * Updated by Stephen G. Tuggy 2022-01-06 + * Updated by Benjamen R. Meyer 2023-05-27 */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/src/cmd/collide2/Stdafx.h b/engine/src/cmd/collide2/Stdafx.h index a51008df0c..4fa112e909 100644 --- a/engine/src/cmd/collide2/Stdafx.h +++ b/engine/src/cmd/collide2/Stdafx.h @@ -6,7 +6,7 @@ * * Copyright (C) Daniel Horn, chuck starchaser, and pheonixstorm * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike contributors - * Copyright (C) 2021-2022 Stephen G. Tuggy + * Copyright (C) 2021-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/collide2/basecollider.h b/engine/src/cmd/collide2/basecollider.h index 67930415f4..7247bc66ea 100644 --- a/engine/src/cmd/collide2/basecollider.h +++ b/engine/src/cmd/collide2/basecollider.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/collide2/csgeom2/opbox.h b/engine/src/cmd/collide2/csgeom2/opbox.h index 71a5b97120..771285b224 100644 --- a/engine/src/cmd/collide2/csgeom2/opbox.h +++ b/engine/src/cmd/collide2/csgeom2/opbox.h @@ -1,7 +1,7 @@ /* Copyright (C) 1998,1999,2000 by Jorrit Tyberghein Largely rewritten by Ivan Avramovic <ivan@avramovic.com> - Copyright (C) 2021-2022 Stephen G Tuggy + Copyright (C) 2021-2023 Stephen G Tuggy, Benjamen R. Meyer This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/engine/src/cmd/collide2/csgeom2/opmath.h b/engine/src/cmd/collide2/csgeom2/opmath.h index e41abd359c..cc3fd5840f 100644 --- a/engine/src/cmd/collide2/csgeom2/opmath.h +++ b/engine/src/cmd/collide2/csgeom2/opmath.h @@ -1,6 +1,6 @@ /* Copyright (C) 2005 by Marten Svanfeldt - Copyright (C) 2022 Stephen G. Tuggy + Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/engine/src/cmd/collide2/csgeom2/opmatrix3.h b/engine/src/cmd/collide2/csgeom2/opmatrix3.h index 101e56827a..53a5e07c7b 100644 --- a/engine/src/cmd/collide2/csgeom2/opmatrix3.h +++ b/engine/src/cmd/collide2/csgeom2/opmatrix3.h @@ -1,7 +1,7 @@ /* Copyright (C) 1998,1999,2000 by Jorrit Tyberghein Largely rewritten by Ivan Avramovic <ivan@avramovic.com> - Copyright (C) 2022 Stephen G. Tuggy + Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/engine/src/cmd/collide2/csgeom2/optransfrm.h b/engine/src/cmd/collide2/csgeom2/optransfrm.h index 17380d2882..854798af8a 100644 --- a/engine/src/cmd/collide2/csgeom2/optransfrm.h +++ b/engine/src/cmd/collide2/csgeom2/optransfrm.h @@ -1,7 +1,7 @@ /* Copyright (C) 1998-2001 by Jorrit Tyberghein Largely rewritten by Ivan Avramovic <ivan@avramovic.com> - Copyright (C) 2022 Stephen G. Tuggy + Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/engine/src/cmd/collide2/csgeom2/opvector3.h b/engine/src/cmd/collide2/csgeom2/opvector3.h index 6c86297c27..8852aa2488 100644 --- a/engine/src/cmd/collide2/csgeom2/opvector3.h +++ b/engine/src/cmd/collide2/csgeom2/opvector3.h @@ -1,7 +1,7 @@ /* Copyright (C) 1998,1999,2000 by Jorrit Tyberghein Largely rewritten by Ivan Avramovic <ivan@avramovic.com> - Copyright (C) 2022 Stephen G. Tuggy + Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/engine/src/cmd/collide2/opcodealgorithms.h b/engine/src/cmd/collide2/opcodealgorithms.h index 9e033a7d61..b2bac8d770 100644 --- a/engine/src/cmd/collide2/opcodealgorithms.h +++ b/engine/src/cmd/collide2/opcodealgorithms.h @@ -1,6 +1,7 @@ /* Crystal Space General Algorithms Copyright (C)2005 by Marten Svanfeldt + Copyright (C)2023 by Benjamen R. Meyer This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/engine/src/cmd/collide2/opcodeextern.h b/engine/src/cmd/collide2/opcodeextern.h index d75f36030a..23eca2c6b3 100644 --- a/engine/src/cmd/collide2/opcodeextern.h +++ b/engine/src/cmd/collide2/opcodeextern.h @@ -1,5 +1,6 @@ /* Copyright (C) 2004 by Jorrit Tyberghein + Copyright (C) 2023 by Benjamen R. Meyer Written by John Harger <jharger AT users.sourceforge.net> This library is free software; you can redistribute it and/or diff --git a/engine/src/cmd/collide2/opcodegarray.h b/engine/src/cmd/collide2/opcodegarray.h index fd5d99a6b5..8436b5f980 100644 --- a/engine/src/cmd/collide2/opcodegarray.h +++ b/engine/src/cmd/collide2/opcodegarray.h @@ -3,6 +3,7 @@ Copyright (C) 1998,1999,2000 by Andrew Zabolotny <bit@eltech.ru> Copyright (C) 2020 pyramid3d Copyright (C) 2020 Stephen G. Tuggy + Copyright (C) 2023 Benjamen R. Meyer This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/engine/src/cmd/collide2/opcodeqint.h b/engine/src/cmd/collide2/opcodeqint.h index 312e7c2ab7..af07fb558c 100644 --- a/engine/src/cmd/collide2/opcodeqint.h +++ b/engine/src/cmd/collide2/opcodeqint.h @@ -1,5 +1,6 @@ /* Copyright (C) 1998-2000 by Andrew Zabolotny + Copyright (C) 2023 Benjamen R. Meyer This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/engine/src/cmd/collide2/opcodeqsqrt.h b/engine/src/cmd/collide2/opcodeqsqrt.h index 05404133b4..f5a6051ff0 100644 --- a/engine/src/cmd/collide2/opcodeqsqrt.h +++ b/engine/src/cmd/collide2/opcodeqsqrt.h @@ -2,6 +2,7 @@ Copyright (C) 2000 by Andrew Zabolotny (Intel version) Copyright (C) 2002 by Matthew Reda <reda@mac.com> (PowerPC version) Fast computation of sqrt(x) and 1/sqrt(x) + Copyright (C) 2023 by Benjamen R. Meyer This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/engine/src/cmd/collide2/opcodesysdef.h b/engine/src/cmd/collide2/opcodesysdef.h index 3f41df85fe..c4057aada0 100644 --- a/engine/src/cmd/collide2/opcodesysdef.h +++ b/engine/src/cmd/collide2/opcodesysdef.h @@ -3,7 +3,7 @@ * * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike contributors. - * Copyright (C) 2021-2022 Stephen G. Tuggy + * Copyright (C) 2021-2023 Stephen G. Tuggy, Benjamen R. Meyer * * This file is part of Vega Strike. * diff --git a/engine/src/cmd/collide2/opcodetypes.h b/engine/src/cmd/collide2/opcodetypes.h index a2a20b4324..906da5a672 100644 --- a/engine/src/cmd/collide2/opcodetypes.h +++ b/engine/src/cmd/collide2/opcodetypes.h @@ -2,7 +2,7 @@ Copyright (C) 1998-2004 by Jorrit Tyberghein Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike contributors - Copyright (C) 2021-2022 Stephen G. Tuggy + Copyright (C) 2021-2023 Stephen G. Tuggy, Benjamen R. Meyer This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/engine/src/cmd/collide2/segmentcell.h b/engine/src/cmd/collide2/segmentcell.h index 42c2d0c126..33eb480c4f 100644 --- a/engine/src/cmd/collide2/segmentcell.h +++ b/engine/src/cmd/collide2/segmentcell.h @@ -1,6 +1,6 @@ /* Copyright (C) 2006 by Kapoulkine Arseny - Copyright (C) 2022 by Stephen G. Tuggy + Copyright (C) 2022-2023 by Stephen G. Tuggy, Benjamen R. Meyer This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/engine/src/cmd/collide_map.h b/engine/src/cmd/collide_map.h index 4355f9f4ca..7f51850890 100644 --- a/engine/src/cmd/collide_map.h +++ b/engine/src/cmd/collide_map.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/collision.h b/engine/src/cmd/collision.h index 82d5826c56..3eaf90244a 100644 --- a/engine/src/cmd/collision.h +++ b/engine/src/cmd/collision.h @@ -3,7 +3,7 @@ * * Copyright (C) 2020 Roy Falk, Stephen G. Tuggy and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/computer.h b/engine/src/cmd/computer.h index ac17b88b19..3ad4156c02 100644 --- a/engine/src/cmd/computer.h +++ b/engine/src/cmd/computer.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/cont_terrain.h b/engine/src/cmd/cont_terrain.h index bca046e434..20c0df498b 100644 --- a/engine/src/cmd/cont_terrain.h +++ b/engine/src/cmd/cont_terrain.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/container.h b/engine/src/cmd/container.h index 60600487a9..6186ca7df0 100644 --- a/engine/src/cmd/container.h +++ b/engine/src/cmd/container.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/csv.h b/engine/src/cmd/csv.h index f55fe8168e..b0cdc71500 100644 --- a/engine/src/cmd/csv.h +++ b/engine/src/cmd/csv.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/damageable.h b/engine/src/cmd/damageable.h index 6356a95476..a350fbaf43 100644 --- a/engine/src/cmd/damageable.h +++ b/engine/src/cmd/damageable.h @@ -3,7 +3,7 @@ * * Copyright (C) 2020 Roy Falk, Stephen G. Tuggy and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/drawable.h b/engine/src/cmd/drawable.h index 7ce786bd5f..119305b1a8 100644 --- a/engine/src/cmd/drawable.h +++ b/engine/src/cmd/drawable.h @@ -3,7 +3,7 @@ * * Copyright (C) 2020 Roy Falk, Stephen G. Tuggy and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/energetic.h b/engine/src/cmd/energetic.h index dbf6d1e198..54a50f37dd 100644 --- a/engine/src/cmd/energetic.h +++ b/engine/src/cmd/energetic.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/engineVersion.h b/engine/src/cmd/engineVersion.h index dd3ff3117b..13c17ae9a4 100644 --- a/engine/src/cmd/engineVersion.h +++ b/engine/src/cmd/engineVersion.h @@ -2,7 +2,7 @@ * engineVersion.h * * Copyright (C) 2021 Benjamen Meyer - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/enhancement.h b/engine/src/cmd/enhancement.h index 5e70bcff43..3634278edc 100644 --- a/engine/src/cmd/enhancement.h +++ b/engine/src/cmd/enhancement.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/faction_factory.h b/engine/src/cmd/faction_factory.h index 70b225a34c..7c7fa2d322 100644 --- a/engine/src/cmd/faction_factory.h +++ b/engine/src/cmd/faction_factory.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/cmd/fg_util.h b/engine/src/cmd/fg_util.h index 048b607ec0..38ad1ff8a9 100644 --- a/engine/src/cmd/fg_util.h +++ b/engine/src/cmd/fg_util.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/images.h b/engine/src/cmd/images.h index 8fd5261ade..da676dc221 100644 --- a/engine/src/cmd/images.h +++ b/engine/src/cmd/images.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/intelligent.h b/engine/src/cmd/intelligent.h index 6f6d3d55d8..bbef78e1ee 100644 --- a/engine/src/cmd/intelligent.h +++ b/engine/src/cmd/intelligent.h @@ -2,7 +2,7 @@ * intelligent.h * * Copyright (C) 2020 Roy Falk - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/jump_capable.h b/engine/src/cmd/jump_capable.h index 8ce032b2d5..7b238ae243 100644 --- a/engine/src/cmd/jump_capable.h +++ b/engine/src/cmd/jump_capable.h @@ -2,7 +2,7 @@ * jump_capable.h * * Copyright (C) 2021 Roy Falk and David Wales - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/key_mutable_set.h b/engine/src/cmd/key_mutable_set.h index d9f432ce8c..52c8ce3ee5 100644 --- a/engine/src/cmd/key_mutable_set.h +++ b/engine/src/cmd/key_mutable_set.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/missile.h b/engine/src/cmd/missile.h index ec51e1cd0e..74d78a17ba 100644 --- a/engine/src/cmd/missile.h +++ b/engine/src/cmd/missile.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/mount.h b/engine/src/cmd/mount.h index dc423e473a..d25d4bd9dc 100644 --- a/engine/src/cmd/mount.h +++ b/engine/src/cmd/mount.h @@ -3,7 +3,7 @@ * * Copyright (C) Daniel Horn * Copyright (C) 2020-2021 Roy Falk - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/mount_size.h b/engine/src/cmd/mount_size.h index 83072ce303..b69fbceee4 100644 --- a/engine/src/cmd/mount_size.h +++ b/engine/src/cmd/mount_size.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Roy Falk, David Wales, and Stephen G. Tuggy. + * Copyright (C) 2021-2023 Roy Falk, David Wales, and Stephen G. Tuggy, Benjamen R. Meyer. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/movable.h b/engine/src/cmd/movable.h index 7d6c69d2c4..21ba269622 100644 --- a/engine/src/cmd/movable.h +++ b/engine/src/cmd/movable.h @@ -1,7 +1,7 @@ /* * movable.h * - * Copyright (C) 2020-2022 Daniel Horn, Roy Falk, Stephen G. Tuggy, + * Copyright (C) 2020-2023 Daniel Horn, Roy Falk, Stephen G. Tuggy, Benjamen R. Meyer, * ministerofinformation, and other Vega Strike contributors * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/cmd/music.h b/engine/src/cmd/music.h index b22adebe6e..9eff91d358 100644 --- a/engine/src/cmd/music.h +++ b/engine/src/cmd/music.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/nebula.h b/engine/src/cmd/nebula.h index b6e1534e19..201f522129 100644 --- a/engine/src/cmd/nebula.h +++ b/engine/src/cmd/nebula.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Roy Falk, - * David Wales, Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Roy Falk, + * David Wales, Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/oldcollection.h b/engine/src/cmd/oldcollection.h index d2af64abf9..102b0afde5 100644 --- a/engine/src/cmd/oldcollection.h +++ b/engine/src/cmd/oldcollection.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/pilot.h b/engine/src/cmd/pilot.h index c2ebd2e852..748d523ceb 100644 --- a/engine/src/cmd/pilot.h +++ b/engine/src/cmd/pilot.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/planet.h b/engine/src/cmd/planet.h index d6f5e943b4..b5b00faef0 100644 --- a/engine/src/cmd/planet.h +++ b/engine/src/cmd/planet.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Roy Falk, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Roy Falk, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/planetary_orbit.h b/engine/src/cmd/planetary_orbit.h index 17816c6992..f80e8efa8c 100644 --- a/engine/src/cmd/planetary_orbit.h +++ b/engine/src/cmd/planetary_orbit.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 Roy Falk, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/role_bitmask.h b/engine/src/cmd/role_bitmask.h index fea9462412..3348bbd8d2 100644 --- a/engine/src/cmd/role_bitmask.h +++ b/engine/src/cmd/role_bitmask.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/script/c_alike/c_alike.h b/engine/src/cmd/script/c_alike/c_alike.h index ea740316fa..9d71cfaa0d 100644 --- a/engine/src/cmd/script/c_alike/c_alike.h +++ b/engine/src/cmd/script/c_alike/c_alike.h @@ -1,7 +1,7 @@ /* * Vega Strike * Copyright (C) 2001-2002 Daniel Horn - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * http://vegastrike.sourceforge.net/ * diff --git a/engine/src/cmd/script/c_alike/c_alike.tab.cpp.h b/engine/src/cmd/script/c_alike/c_alike.tab.cpp.h index fdd0164866..f6af2241ee 100644 --- a/engine/src/cmd/script/c_alike/c_alike.tab.cpp.h +++ b/engine/src/cmd/script/c_alike/c_alike.tab.cpp.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/cmd/script/flightgroup.h b/engine/src/cmd/script/flightgroup.h index 04dbe37c69..e69d5c4b69 100644 --- a/engine/src/cmd/script/flightgroup.h +++ b/engine/src/cmd/script/flightgroup.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/script/mission.h b/engine/src/cmd/script/mission.h index 21274f8ab9..ddb9056f87 100644 --- a/engine/src/cmd/script/mission.h +++ b/engine/src/cmd/script/mission.h @@ -4,7 +4,7 @@ * Copyright (C) 2001-2002 Daniel Horn * Copyright (C) Alexander Rawass <alexannika@users.sourceforge.net> * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike contributors - * Copyright (C) 2021-2022 Stephen G. Tuggy + * Copyright (C) 2021-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/script/mission_types.h b/engine/src/cmd/script/mission_types.h index a3b30830a2..fc4f031436 100644 --- a/engine/src/cmd/script/mission_types.h +++ b/engine/src/cmd/script/mission_types.h @@ -3,7 +3,7 @@ * * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors -* Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors +* Copyright (c) 2019-2023 Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike Contributors * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/script/msgcenter.h b/engine/src/cmd/script/msgcenter.h index 8d17ca429f..80fb0a7d2d 100644 --- a/engine/src/cmd/script/msgcenter.h +++ b/engine/src/cmd/script/msgcenter.h @@ -4,7 +4,7 @@ * Copyright (C) 2001-2002 Daniel Horn * Copyright (C) Alexander Rawass * Copyright (C) 2020 Stephen G. Tuggy, pyramid3d, and other Vega Strike contributors - * Copyright (C) 2021-2022 Stephen G. Tuggy + * Copyright (C) 2021-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/script/pythonmission.h b/engine/src/cmd/script/pythonmission.h index 8ca39279c5..f54f4dd031 100644 --- a/engine/src/cmd/script/pythonmission.h +++ b/engine/src/cmd/script/pythonmission.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/terrain.h b/engine/src/cmd/terrain.h index d134a964a2..20405c4e0b 100644 --- a/engine/src/cmd/terrain.h +++ b/engine/src/cmd/terrain.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/testcollection/unit.h b/engine/src/cmd/testcollection/unit.h index 89d9d8b9dd..bcf4171a8e 100644 --- a/engine/src/cmd/testcollection/unit.h +++ b/engine/src/cmd/testcollection/unit.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/turret.h b/engine/src/cmd/turret.h index f78201b44e..6282c3abc6 100644 --- a/engine/src/cmd/turret.h +++ b/engine/src/cmd/turret.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/unit_click.h b/engine/src/cmd/unit_click.h index 542835fe57..b08adb281d 100644 --- a/engine/src/cmd/unit_click.h +++ b/engine/src/cmd/unit_click.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/unit_collide.h b/engine/src/cmd/unit_collide.h index c24fb84ceb..f197d97087 100644 --- a/engine/src/cmd/unit_collide.h +++ b/engine/src/cmd/unit_collide.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/cmd/unit_const_cache.h b/engine/src/cmd/unit_const_cache.h index def7556216..a68ae224d6 100644 --- a/engine/src/cmd/unit_const_cache.h +++ b/engine/src/cmd/unit_const_cache.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/unit_csv.h b/engine/src/cmd/unit_csv.h index fdaf2f81bd..36e347badf 100644 --- a/engine/src/cmd/unit_csv.h +++ b/engine/src/cmd/unit_csv.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/unit_csv_factory.h b/engine/src/cmd/unit_csv_factory.h index 79b9477370..3d6b87c8bf 100644 --- a/engine/src/cmd/unit_csv_factory.h +++ b/engine/src/cmd/unit_csv_factory.h @@ -2,7 +2,7 @@ * unit_csv_factory.cpp * * Copyright (C) 2021 Roy Falk - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/unit_customize.h b/engine/src/cmd/unit_customize.h index cb3117e29f..a3d5405686 100644 --- a/engine/src/cmd/unit_customize.h +++ b/engine/src/cmd/unit_customize.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/unit_find.h b/engine/src/cmd/unit_find.h index 8c6e93971a..5a6be666fc 100644 --- a/engine/src/cmd/unit_find.h +++ b/engine/src/cmd/unit_find.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/unit_generic.h b/engine/src/cmd/unit_generic.h index 3f3015f618..ad40e87151 100644 --- a/engine/src/cmd/unit_generic.h +++ b/engine/src/cmd/unit_generic.h @@ -6,7 +6,7 @@ /* * unit_generic.cpp * - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, Roy Falk, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Roy Falk, Benjamen R. Meyer, * and other Vega Strike contributors * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/cmd/unit_json_factory.h b/engine/src/cmd/unit_json_factory.h index b0aed97094..83905e8ef3 100644 --- a/engine/src/cmd/unit_json_factory.h +++ b/engine/src/cmd/unit_json_factory.h @@ -2,7 +2,7 @@ * unit_json_factory.cpp * * Copyright (C) 2021 Roy Falk - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/unit_optimize_factory.h b/engine/src/cmd/unit_optimize_factory.h index e8b1f49756..24e9a9004a 100644 --- a/engine/src/cmd/unit_optimize_factory.h +++ b/engine/src/cmd/unit_optimize_factory.h @@ -1,7 +1,7 @@ /* * unit_optimize_factory.cpp * - * Copyright (C) 2020-2022 Daniel Horn, Roy Falk, Stephen G. Tuggy, and + * Copyright (C) 2020-2023 Daniel Horn, Roy Falk, Stephen G. Tuggy, Benjamen R. Meyer, and * other Vega Strike contributors * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/cmd/unit_physics.h b/engine/src/cmd/unit_physics.h index 39ef737d01..8e970426eb 100644 --- a/engine/src/cmd/unit_physics.h +++ b/engine/src/cmd/unit_physics.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Roy Falk, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Roy Falk, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/unit_type.h b/engine/src/cmd/unit_type.h index 58f78dad11..d837322d90 100644 --- a/engine/src/cmd/unit_type.h +++ b/engine/src/cmd/unit_type.h @@ -3,7 +3,7 @@ * * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors -* Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors +* Copyright (c) 2019-2023 Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike Contributors * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/unit_util.h b/engine/src/cmd/unit_util.h index c292da8908..4e539e9a3d 100644 --- a/engine/src/cmd/unit_util.h +++ b/engine/src/cmd/unit_util.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/unit_xml.h b/engine/src/cmd/unit_xml.h index 946e132b9f..9e7cdcc89c 100644 --- a/engine/src/cmd/unit_xml.h +++ b/engine/src/cmd/unit_xml.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/upgradeable_unit.h b/engine/src/cmd/upgradeable_unit.h index 04ca13ae91..609e1db248 100644 --- a/engine/src/cmd/upgradeable_unit.h +++ b/engine/src/cmd/upgradeable_unit.h @@ -2,7 +2,7 @@ /* * upgradeable_unit.h * - * Copyright (C) 2001-2023 Daniel Horn, Benjaman Meyer, Roy Falk, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, Benjaman Meyer, Roy Falk, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/cmd/vs_limits.h b/engine/src/cmd/vs_limits.h index ed12a4266d..ac75198f70 100644 --- a/engine/src/cmd/vs_limits.h +++ b/engine/src/cmd/vs_limits.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/weapon_factory.h b/engine/src/cmd/weapon_factory.h index cb8c34eebb..066b334cae 100644 --- a/engine/src/cmd/weapon_factory.h +++ b/engine/src/cmd/weapon_factory.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/cmd/weapon_info.h b/engine/src/cmd/weapon_info.h index 1e1ba7adf3..cdb1826143 100644 --- a/engine/src/cmd/weapon_info.h +++ b/engine/src/cmd/weapon_info.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/cmd/weapon_type.h b/engine/src/cmd/weapon_type.h index fe79cf4bf0..04411a06a7 100644 --- a/engine/src/cmd/weapon_type.h +++ b/engine/src/cmd/weapon_type.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/command.h b/engine/src/command.h index ae4230b0f8..090a4358ea 100644 --- a/engine/src/command.h +++ b/engine/src/command.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/common/common.h b/engine/src/common/common.h index 57fb02a368..64bd502aa7 100644 --- a/engine/src/common/common.h +++ b/engine/src/common/common.h @@ -4,7 +4,7 @@ * begin : Wed Jun 26 2002 * copyright : (C) 2002 by jhunt * email : jhunt@jaja -* copyright : (C) 2022 by Stephen G. Tuggy +* copyright : (C) 2023 by Stephen G. Tuggy, Benjamen R. Meyer ***************************************************************************/ /*************************************************************************** diff --git a/engine/src/config_xml.h b/engine/src/config_xml.h index 66d09086bc..35f4aafec4 100644 --- a/engine/src/config_xml.h +++ b/engine/src/config_xml.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Alexander Rawass, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, Alexander Rawass, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/configuration/configuration.h b/engine/src/configuration/configuration.h index 4fef08fc19..a3f82a220d 100644 --- a/engine/src/configuration/configuration.h +++ b/engine/src/configuration/configuration.h @@ -1,8 +1,8 @@ /* * configuration.h * - * Copyright (C) 2021-2022 Daniel Horn, Roy Falk, ministerofinformation, - * David Wales, Stephen G. Tuggy, and other Vega Strike contributors + * Copyright (C) 2021-2023 Daniel Horn, Roy Falk, ministerofinformation, + * David Wales, Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/configuration/game_config.h b/engine/src/configuration/game_config.h index 8c2380ce4b..fbab33faaf 100644 --- a/engine/src/configuration/game_config.h +++ b/engine/src/configuration/game_config.h @@ -1,7 +1,7 @@ /* * game_config.h * - * Copyright (C) 2020-2022 Daniel Horn, Roy Falk, Stephen G. Tuggy, + * Copyright (C) 2020-2023 Daniel Horn, Roy Falk, Stephen G. Tuggy, Benjamen R. Meyer, * David Wales, and other Vega Strike contributors * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/configxml.h b/engine/src/configxml.h index 9529918f88..8dcb6c8d90 100644 --- a/engine/src/configxml.h +++ b/engine/src/configxml.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Alexander Rawass, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, Alexander Rawass, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/damage/core_vector.h b/engine/src/damage/core_vector.h index f57965e422..571b36402e 100644 --- a/engine/src/damage/core_vector.h +++ b/engine/src/damage/core_vector.h @@ -2,7 +2,7 @@ * core_vector.h * * Copyright (C) 2021 Roy Falk - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/damage/damage.h b/engine/src/damage/damage.h index 522abcc0a0..249a8955f5 100644 --- a/engine/src/damage/damage.h +++ b/engine/src/damage/damage.h @@ -2,7 +2,7 @@ * damage.h * * Copyright (C) 2021 Roy Falk - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/damage/damageable_layer.h b/engine/src/damage/damageable_layer.h index e316de1071..46af49c25f 100644 --- a/engine/src/damage/damageable_layer.h +++ b/engine/src/damage/damageable_layer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Roy Falk, Stephen G. Tuggy, + * Copyright (C) 2021-2023 Roy Falk, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/damage/damageable_object.h b/engine/src/damage/damageable_object.h index 20d37f2459..592bdc4a5d 100644 --- a/engine/src/damage/damageable_object.h +++ b/engine/src/damage/damageable_object.h @@ -2,7 +2,7 @@ * damageable_object.h * * Copyright (C) 2021 Roy Falk - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/damage/facet_configuration.h b/engine/src/damage/facet_configuration.h index f78bbdbb61..238b769017 100644 --- a/engine/src/damage/facet_configuration.h +++ b/engine/src/damage/facet_configuration.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Roy Falk, Stephen G. Tuggy, + * Copyright (C) 2021-2023 Roy Falk, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/damage/health.h b/engine/src/damage/health.h index 5d6462e24c..8d06d16506 100644 --- a/engine/src/damage/health.h +++ b/engine/src/damage/health.h @@ -1,7 +1,7 @@ /* * health.h * - * Copyright (C) 2021-2022 Daniel Horn, Roy Falk, Stephen G. Tuggy, + * Copyright (C) 2021-2023 Daniel Horn, Roy Falk, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/debug_vs.h b/engine/src/debug_vs.h index ac66b593b1..7efac47abf 100644 --- a/engine/src/debug_vs.h +++ b/engine/src/debug_vs.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/easydom.h b/engine/src/easydom.h index d80d0ad948..e79913f9f6 100644 --- a/engine/src/easydom.h +++ b/engine/src/easydom.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Alexander Rawass, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Alexander Rawass, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/endianness.h b/engine/src/endianness.h index 07196d04e9..459c4d10e4 100644 --- a/engine/src/endianness.h +++ b/engine/src/endianness.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/faction_generic.h b/engine/src/faction_generic.h index 4efb64c890..31e40bba16 100644 --- a/engine/src/faction_generic.h +++ b/engine/src/faction_generic.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/ffmpeg_init.h b/engine/src/ffmpeg_init.h index fea94c0c4c..3cf530c152 100644 --- a/engine/src/ffmpeg_init.h +++ b/engine/src/ffmpeg_init.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/file_main.h b/engine/src/file_main.h index 4eadf87f47..d6fdcac436 100644 --- a/engine/src/file_main.h +++ b/engine/src/file_main.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/force_feedback.h b/engine/src/force_feedback.h index 9563472f80..cf576a5c61 100644 --- a/engine/src/force_feedback.h +++ b/engine/src/force_feedback.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Alexander Rawass, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Alexander Rawass, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/functors.h b/engine/src/functors.h index 60a2db2ada..3d3e97d5ad 100644 --- a/engine/src/functors.h +++ b/engine/src/functors.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Matthew Adams, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Matthew Adams, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/galaxy.h b/engine/src/galaxy.h index dfff8421af..801d0ea11c 100644 --- a/engine/src/galaxy.h +++ b/engine/src/galaxy.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/galaxy_gen.h b/engine/src/galaxy_gen.h index 9ffce8a3cd..942a877f28 100644 --- a/engine/src/galaxy_gen.h +++ b/engine/src/galaxy_gen.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Evert Vorster, - * Roy Falk, Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Evert Vorster, + * Roy Falk, Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/galaxy_xml.h b/engine/src/galaxy_xml.h index 8d86aba8af..edb9848f26 100644 --- a/engine/src/galaxy_xml.h +++ b/engine/src/galaxy_xml.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/gamemenu.h b/engine/src/gamemenu.h index 1f0db7dab9..5d4b56f0ef 100644 --- a/engine/src/gamemenu.h +++ b/engine/src/gamemenu.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/gfx/aligned.h b/engine/src/gfx/aligned.h index 46b7373780..a85736953d 100644 --- a/engine/src/gfx/aligned.h +++ b/engine/src/gfx/aligned.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, klaussfreire, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, klaussfreire, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/ani_texture.h b/engine/src/gfx/ani_texture.h index a8ad8def4b..dbaf082db7 100644 --- a/engine/src/gfx/ani_texture.h +++ b/engine/src/gfx/ani_texture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/gfx/animation.h b/engine/src/gfx/animation.h index 81d559521b..3092eeceb8 100644 --- a/engine/src/gfx/animation.h +++ b/engine/src/gfx/animation.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, ace123, surfdargent, klaussfreire, - * jacks, dan_w, pyramid3d, Roy Falk, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, ace123, surfdargent, klaussfreire, + * jacks, dan_w, pyramid3d, Roy Falk, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/gfx/aux_logo.h b/engine/src/gfx/aux_logo.h index 800d3e0dd5..2dcc87295b 100644 --- a/engine/src/gfx/aux_logo.h +++ b/engine/src/gfx/aux_logo.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, ace123, surfdargent, klaussfreire, - * jacks, dan_w, ashieh, griwodz, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, ace123, surfdargent, klaussfreire, + * jacks, dan_w, ashieh, griwodz, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/gfx/aux_palette.h b/engine/src/gfx/aux_palette.h index cc927e38c1..3079fc1300 100644 --- a/engine/src/gfx/aux_palette.h +++ b/engine/src/gfx/aux_palette.h @@ -4,7 +4,7 @@ * Copyright (C) 2001-2002 Daniel Horn * Copyright (C) 2003-2019 dan_w and other Vega Strike contributors * Copyright (C) 2020 pyramid3d - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/aux_texture.h b/engine/src/gfx/aux_texture.h index a1a442d0d5..a0ff2d2c4b 100644 --- a/engine/src/gfx/aux_texture.h +++ b/engine/src/gfx/aux_texture.h @@ -2,7 +2,7 @@ * aux_texture.h * * Copyright (C) 2001-2002 Daniel Horn - * Copyright (C) 2021-2022 Stephen G. Tuggy + * Copyright (C) 2021-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/background.h b/engine/src/gfx/background.h index c94ad88083..ccd7de44ab 100644 --- a/engine/src/gfx/background.h +++ b/engine/src/gfx/background.h @@ -5,7 +5,7 @@ * Copyright (C) 2003-2019 dan_w, klaussfreire, * and other Vega Strike contributors * Copyright (C) 2020 pyramid3d - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/boltdrawmanager.h b/engine/src/gfx/boltdrawmanager.h index 0935255dde..992f1b65c1 100644 --- a/engine/src/gfx/boltdrawmanager.h +++ b/engine/src/gfx/boltdrawmanager.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/camera.h b/engine/src/gfx/camera.h index e089463bca..348c9ab0da 100644 --- a/engine/src/gfx/camera.h +++ b/engine/src/gfx/camera.h @@ -2,7 +2,7 @@ * camera.h * * Copyright (C) 2001-2002 Daniel Horn and Alan Shieh - * Copyright (C) 2021-2022 Stephen G. Tuggy + * Copyright (C) 2021-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/car_assist.h b/engine/src/gfx/car_assist.h index f5bf6ec629..8e45feb520 100644 --- a/engine/src/gfx/car_assist.h +++ b/engine/src/gfx/car_assist.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/cockpit.h b/engine/src/gfx/cockpit.h index 6dda62057b..0dcf8886ff 100644 --- a/engine/src/gfx/cockpit.h +++ b/engine/src/gfx/cockpit.h @@ -5,7 +5,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/cockpit_generic.h b/engine/src/gfx/cockpit_generic.h index 47cfd881ac..a82fe80513 100644 --- a/engine/src/gfx/cockpit_generic.h +++ b/engine/src/gfx/cockpit_generic.h @@ -3,7 +3,7 @@ * * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike contributors - * Copyright (C) 2021-2022 Stephen G. Tuggy + * Copyright (C) 2021-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/cockpit_gfx.h b/engine/src/gfx/cockpit_gfx.h index 120d896c81..518ae9f776 100644 --- a/engine/src/gfx/cockpit_gfx.h +++ b/engine/src/gfx/cockpit_gfx.h @@ -4,7 +4,7 @@ * * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike contributors - * Copyright (C) 2021-2022 Stephen G. Tuggy + * Copyright (C) 2021-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/cockpit_gfx_utils.h b/engine/src/gfx/cockpit_gfx_utils.h index 737936ee07..0dd80338cd 100644 --- a/engine/src/gfx/cockpit_gfx_utils.h +++ b/engine/src/gfx/cockpit_gfx_utils.h @@ -4,7 +4,7 @@ * * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike contributors - * Copyright (C) 2021-2022 Stephen G. Tuggy + * Copyright (C) 2021-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/coord_select.h b/engine/src/gfx/coord_select.h index 5f58041f26..231da92f71 100644 --- a/engine/src/gfx/coord_select.h +++ b/engine/src/gfx/coord_select.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/decalqueue.h b/engine/src/gfx/decalqueue.h index 9fa9530ead..c85bc34d7c 100644 --- a/engine/src/gfx/decalqueue.h +++ b/engine/src/gfx/decalqueue.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/env_map_gent.h b/engine/src/gfx/env_map_gent.h index c381b513e2..19a7e08a0c 100644 --- a/engine/src/gfx/env_map_gent.h +++ b/engine/src/gfx/env_map_gent.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/gauge.h b/engine/src/gfx/gauge.h index 9d8fb70cb1..b48a585074 100644 --- a/engine/src/gfx/gauge.h +++ b/engine/src/gfx/gauge.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/halo.h b/engine/src/gfx/halo.h index 176fd2de2d..d8245a6d33 100644 --- a/engine/src/gfx/halo.h +++ b/engine/src/gfx/halo.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/halo_system.h b/engine/src/gfx/halo_system.h index d1f0dc7ba2..82d01d64b5 100644 --- a/engine/src/gfx/halo_system.h +++ b/engine/src/gfx/halo_system.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/hud.h b/engine/src/gfx/hud.h index 95bb35570b..f5dca20c5d 100644 --- a/engine/src/gfx/hud.h +++ b/engine/src/gfx/hud.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Alan Shieh, ace123, dan_w, - * jacks, klaussfreire, pyramid3d, Roy Falk, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, Alan Shieh, ace123, dan_w, + * jacks, klaussfreire, pyramid3d, Roy Falk, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/gfx/jpeg_memory.h b/engine/src/gfx/jpeg_memory.h index bf4957f99a..7a8118e4f1 100644 --- a/engine/src/gfx/jpeg_memory.h +++ b/engine/src/gfx/jpeg_memory.h @@ -5,7 +5,7 @@ * and other Vega Strike contributors * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, Evert Vorster, * and other Vega Strike contributors - * Copyright (C) 2021-2022 Stephen G. Tuggy + * Copyright (C) 2021-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/lerp.h b/engine/src/gfx/lerp.h index fc62909e56..ab094e4c49 100644 --- a/engine/src/gfx/lerp.h +++ b/engine/src/gfx/lerp.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/loc_select.h b/engine/src/gfx/loc_select.h index 4aac9acc94..4c8cdfe40c 100644 --- a/engine/src/gfx/loc_select.h +++ b/engine/src/gfx/loc_select.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/masks.h b/engine/src/gfx/masks.h index 68613f538a..82404185e2 100644 --- a/engine/src/gfx/masks.h +++ b/engine/src/gfx/masks.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/matrix.h b/engine/src/gfx/matrix.h index 0856d39b1e..00af958cf8 100644 --- a/engine/src/gfx/matrix.h +++ b/engine/src/gfx/matrix.h @@ -4,7 +4,7 @@ * Copyright (C) 2001-2002 Alan Shieh and Daniel Horn * Copyright (C) 2020-2021 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/mesh.h b/engine/src/gfx/mesh.h index 0b71a3e045..aec5e45876 100644 --- a/engine/src/gfx/mesh.h +++ b/engine/src/gfx/mesh.h @@ -6,7 +6,7 @@ * ace123, jacks, and other Vega Strike contributors * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, Roy Falk, * and other Vega Strike contributors - * Copyright (C) 2021-2022 Stephen G. Tuggy + * Copyright (C) 2021-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/mesh_bxm.h b/engine/src/gfx/mesh_bxm.h index 8f112136b3..13ecb0a973 100644 --- a/engine/src/gfx/mesh_bxm.h +++ b/engine/src/gfx/mesh_bxm.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/mesh_io.h b/engine/src/gfx/mesh_io.h index 951fdebcb3..2ffbfaae92 100644 --- a/engine/src/gfx/mesh_io.h +++ b/engine/src/gfx/mesh_io.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/mesh_xml.h b/engine/src/gfx/mesh_xml.h index 352c1eb59b..b026de6af3 100644 --- a/engine/src/gfx/mesh_xml.h +++ b/engine/src/gfx/mesh_xml.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/nav/criteria.h b/engine/src/gfx/nav/criteria.h index 76758c1bbf..cf0332f722 100644 --- a/engine/src/gfx/nav/criteria.h +++ b/engine/src/gfx/nav/criteria.h @@ -4,7 +4,7 @@ * Copyright (C) 2003 Mike Byron * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike contributors. - * Copyright (C) 2021-2022 Stephen G. Tuggy + * Copyright (C) 2021-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/nav/drawlist.h b/engine/src/gfx/nav/drawlist.h index 4addee0748..46817deb3f 100644 --- a/engine/src/gfx/nav/drawlist.h +++ b/engine/src/gfx/nav/drawlist.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/nav/navcomputer.h b/engine/src/gfx/nav/navcomputer.h index 0d4c653606..72082dcc2f 100644 --- a/engine/src/gfx/nav/navcomputer.h +++ b/engine/src/gfx/nav/navcomputer.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Mike Byron, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Mike Byron, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/nav/navgetxmldata.h b/engine/src/gfx/nav/navgetxmldata.h index a4869e5b6e..437c56edf8 100644 --- a/engine/src/gfx/nav/navgetxmldata.h +++ b/engine/src/gfx/nav/navgetxmldata.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/nav/navitemstodraw.h b/engine/src/gfx/nav/navitemstodraw.h index cd8eee729d..1637764bb7 100644 --- a/engine/src/gfx/nav/navitemstodraw.h +++ b/engine/src/gfx/nav/navitemstodraw.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/nav/navitemtypes.h b/engine/src/gfx/nav/navitemtypes.h index 911aa14471..80600c22c3 100644 --- a/engine/src/gfx/nav/navitemtypes.h +++ b/engine/src/gfx/nav/navitemtypes.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/nav/navparse.h b/engine/src/gfx/nav/navparse.h index b7a9d38cc2..0cc71ebc0f 100644 --- a/engine/src/gfx/nav/navparse.h +++ b/engine/src/gfx/nav/navparse.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/nav/navpath.h b/engine/src/gfx/nav/navpath.h index 3b9fa72e44..90deb3a069 100644 --- a/engine/src/gfx/nav/navpath.h +++ b/engine/src/gfx/nav/navpath.h @@ -4,7 +4,7 @@ * Copyright (C) 2003 Mike Byron * Copyright (C) 2020 pyramid3d, Roy Falk, Stephen G. Tuggy, and other * Vega Strike contributors. - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/nav/navscreen.h b/engine/src/gfx/nav/navscreen.h index a9408bc1f4..883394a64c 100644 --- a/engine/src/gfx/nav/navscreen.h +++ b/engine/src/gfx/nav/navscreen.h @@ -3,7 +3,7 @@ * * Copyright (C) 2003-2020 hellcatv, ace123, surfdargent, klaussfreire, jacks, * pyramid3d, Stephen G. Tuggy, and other Vega Strike contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/nav/navscreenoccupied.h b/engine/src/gfx/nav/navscreenoccupied.h index ec88fc9df4..a1ce3ab669 100644 --- a/engine/src/gfx/nav/navscreenoccupied.h +++ b/engine/src/gfx/nav/navscreenoccupied.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/nonlinear_transform.h b/engine/src/gfx/nonlinear_transform.h index 88583cdbbd..b4ef77684b 100644 --- a/engine/src/gfx/nonlinear_transform.h +++ b/engine/src/gfx/nonlinear_transform.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/occlusion.h b/engine/src/gfx/occlusion.h index 576e473649..ce283408f0 100644 --- a/engine/src/gfx/occlusion.h +++ b/engine/src/gfx/occlusion.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2012 Claudio Freire * Copyright (C) 2019-2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike contributors - * Copyright (C) 2021-2022 Stephen G. Tuggy + * Copyright (C) 2021-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/particle.h b/engine/src/gfx/particle.h index 2bd6bbba00..859c915614 100644 --- a/engine/src/gfx/particle.h +++ b/engine/src/gfx/particle.h @@ -1,7 +1,7 @@ /* * particle.h * - * Copyright (c) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (c) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike Contributors * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/gfx/pass.h b/engine/src/gfx/pass.h index d0fb1cb330..01748d252b 100644 --- a/engine/src/gfx/pass.h +++ b/engine/src/gfx/pass.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/pipelined_texture.h b/engine/src/gfx/pipelined_texture.h index 940cc031f5..90e7749a11 100644 --- a/engine/src/gfx/pipelined_texture.h +++ b/engine/src/gfx/pipelined_texture.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/point_to_cam.h b/engine/src/gfx/point_to_cam.h index 032bdfe04b..5a73cadf83 100644 --- a/engine/src/gfx/point_to_cam.h +++ b/engine/src/gfx/point_to_cam.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/quadsquare.h b/engine/src/gfx/quadsquare.h index d21b377921..a509b7decf 100644 --- a/engine/src/gfx/quadsquare.h +++ b/engine/src/gfx/quadsquare.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/gfx/quadtree.h b/engine/src/gfx/quadtree.h index c5e4020d27..fa67b068c7 100644 --- a/engine/src/gfx/quadtree.h +++ b/engine/src/gfx/quadtree.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/quaternion.h b/engine/src/gfx/quaternion.h index 2378f0849d..00ccae385a 100644 --- a/engine/src/gfx/quaternion.h +++ b/engine/src/gfx/quaternion.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/radar/bubble_display.h b/engine/src/gfx/radar/bubble_display.h index ded6f73d82..cda8d9d7db 100644 --- a/engine/src/gfx/radar/bubble_display.h +++ b/engine/src/gfx/radar/bubble_display.h @@ -5,7 +5,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/radar/dual_display.h b/engine/src/gfx/radar/dual_display.h index 78113eb02c..3cdbfb5bec 100644 --- a/engine/src/gfx/radar/dual_display.h +++ b/engine/src/gfx/radar/dual_display.h @@ -5,7 +5,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/radar/null_display.h b/engine/src/gfx/radar/null_display.h index a298fcf7ef..e9ed5c0f63 100644 --- a/engine/src/gfx/radar/null_display.h +++ b/engine/src/gfx/radar/null_display.h @@ -5,7 +5,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/radar/plane_display.h b/engine/src/gfx/radar/plane_display.h index ba348cd0de..b057aae9bc 100644 --- a/engine/src/gfx/radar/plane_display.h +++ b/engine/src/gfx/radar/plane_display.h @@ -5,7 +5,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/radar/radar.h b/engine/src/gfx/radar/radar.h index b787ed3fe1..8cbc85a8ff 100644 --- a/engine/src/gfx/radar/radar.h +++ b/engine/src/gfx/radar/radar.h @@ -5,7 +5,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/radar/sensor.h b/engine/src/gfx/radar/sensor.h index 0fe7a08633..42b7cc6641 100644 --- a/engine/src/gfx/radar/sensor.h +++ b/engine/src/gfx/radar/sensor.h @@ -6,7 +6,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/radar/sphere_display.h b/engine/src/gfx/radar/sphere_display.h index a52384bd8d..b70f9cfd56 100644 --- a/engine/src/gfx/radar/sphere_display.h +++ b/engine/src/gfx/radar/sphere_display.h @@ -5,7 +5,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/radar/track.h b/engine/src/gfx/radar/track.h index 220610fb91..91a6d36a5a 100644 --- a/engine/src/gfx/radar/track.h +++ b/engine/src/gfx/radar/track.h @@ -5,7 +5,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/radar/viewarea.h b/engine/src/gfx/radar/viewarea.h index f0b1190c78..061d3a2c96 100644 --- a/engine/src/gfx/radar/viewarea.h +++ b/engine/src/gfx/radar/viewarea.h @@ -5,7 +5,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/ring.h b/engine/src/gfx/ring.h index 1d70264838..44a7fe9eba 100644 --- a/engine/src/gfx/ring.h +++ b/engine/src/gfx/ring.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/screenshot.h b/engine/src/gfx/screenshot.h index 6f29d7d032..1d4fd1fa44 100644 --- a/engine/src/gfx/screenshot.h +++ b/engine/src/gfx/screenshot.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/soundcontainer.h b/engine/src/gfx/soundcontainer.h index 3a884b11c3..99010dd3b6 100644 --- a/engine/src/gfx/soundcontainer.h +++ b/engine/src/gfx/soundcontainer.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/soundcontainer_aldrv.h b/engine/src/gfx/soundcontainer_aldrv.h index 39a2a55c12..4da6531238 100644 --- a/engine/src/gfx/soundcontainer_aldrv.h +++ b/engine/src/gfx/soundcontainer_aldrv.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/soundcontainer_generic.h b/engine/src/gfx/soundcontainer_generic.h index 3553a332fc..54f120c09f 100644 --- a/engine/src/gfx/soundcontainer_generic.h +++ b/engine/src/gfx/soundcontainer_generic.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/sphere.h b/engine/src/gfx/sphere.h index 362d9aa282..e278326788 100644 --- a/engine/src/gfx/sphere.h +++ b/engine/src/gfx/sphere.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/sprite.h b/engine/src/gfx/sprite.h index 399caae758..150ec7b166 100644 --- a/engine/src/gfx/sprite.h +++ b/engine/src/gfx/sprite.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Alan Shieh, klaussfreire, - * surfdargent, dan_w, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, Alan Shieh, klaussfreire, + * surfdargent, dan_w, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/gfx/star.h b/engine/src/gfx/star.h index e5ce8b17ca..6c9fdfb317 100644 --- a/engine/src/gfx/star.h +++ b/engine/src/gfx/star.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/stream_texture.h b/engine/src/gfx/stream_texture.h index 95b81eebbd..d0b49924b2 100644 --- a/engine/src/gfx/stream_texture.h +++ b/engine/src/gfx/stream_texture.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/technique.h b/engine/src/gfx/technique.h index 1c294bd8f7..13b2034386 100644 --- a/engine/src/gfx/technique.h +++ b/engine/src/gfx/technique.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/texture_manager.h b/engine/src/gfx/texture_manager.h index c3f98ac517..bb7437e99b 100644 --- a/engine/src/gfx/texture_manager.h +++ b/engine/src/gfx/texture_manager.h @@ -2,7 +2,7 @@ * texture_manager.cpp * * Copyright (C) 2021 Roy Falk - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/tvector.h b/engine/src/gfx/tvector.h index b844cefc9c..1d992b0b13 100644 --- a/engine/src/gfx/tvector.h +++ b/engine/src/gfx/tvector.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Roy Falk, Nachum Barcohen, David Wales, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Roy Falk, Nachum Barcohen, David Wales, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/vdu.h b/engine/src/gfx/vdu.h index eddb756cdb..b98a79b084 100644 --- a/engine/src/gfx/vdu.h +++ b/engine/src/gfx/vdu.h @@ -4,7 +4,7 @@ * Copyright (C) Daniel Horn * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike * contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/vec.h b/engine/src/gfx/vec.h index 1afc807f94..703f250058 100644 --- a/engine/src/gfx/vec.h +++ b/engine/src/gfx/vec.h @@ -6,7 +6,7 @@ * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (C) 2019-2021 Stephen G. Tuggy, Roy Falk, David Wales, * and other Vega Strike contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/vectorizable.h b/engine/src/gfx/vectorizable.h index bc08b63bc9..cf984f0feb 100644 --- a/engine/src/gfx/vectorizable.h +++ b/engine/src/gfx/vectorizable.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/vertex.h b/engine/src/gfx/vertex.h index 5c072eaeb2..eed9b93f4b 100644 --- a/engine/src/gfx/vertex.h +++ b/engine/src/gfx/vertex.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/vid_file.h b/engine/src/gfx/vid_file.h index 723b1f47df..450808f4b6 100644 --- a/engine/src/gfx/vid_file.h +++ b/engine/src/gfx/vid_file.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/vsbox.h b/engine/src/gfx/vsbox.h index 987793438f..5845896dff 100644 --- a/engine/src/gfx/vsbox.h +++ b/engine/src/gfx/vsbox.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfx/vsimage.h b/engine/src/gfx/vsimage.h index ffeb8c1fde..e4f191beaa 100644 --- a/engine/src/gfx/vsimage.h +++ b/engine/src/gfx/vsimage.h @@ -3,7 +3,7 @@ * * Copyright (C) 2020 pyramid3d, Roy Falk, Stephen G. Tuggy, * and other Vega Strike contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * This file is part of Vega Strike. * diff --git a/engine/src/gfx/warptrail.h b/engine/src/gfx/warptrail.h index 24ffa62d22..74597170fd 100644 --- a/engine/src/gfx/warptrail.h +++ b/engine/src/gfx/warptrail.h @@ -4,7 +4,7 @@ * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors * Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors - * Copyright (C) 2022 Stephen G. Tuggy + * Copyright (C) 2022-2023 Stephen G. Tuggy, Benjamen R. Meyer * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gfxlib.h b/engine/src/gfxlib.h index 6678a80f69..ddbee14d5c 100644 --- a/engine/src/gfxlib.h +++ b/engine/src/gfxlib.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/gfxlib_struct.h b/engine/src/gfxlib_struct.h index ea06fe84bc..1c305e8a08 100644 --- a/engine/src/gfxlib_struct.h +++ b/engine/src/gfxlib_struct.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/gldrv/gl_globals.h b/engine/src/gldrv/gl_globals.h index 6b58e25ca3..074f28a669 100644 --- a/engine/src/gldrv/gl_globals.h +++ b/engine/src/gldrv/gl_globals.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Alan Shieh, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Alan Shieh, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gldrv/gl_include.h b/engine/src/gldrv/gl_include.h index 5b170cfea2..5c94db9481 100644 --- a/engine/src/gldrv/gl_include.h +++ b/engine/src/gldrv/gl_include.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/gldrv/gl_init.h b/engine/src/gldrv/gl_init.h index 2ae40da9a0..0c85fad020 100644 --- a/engine/src/gldrv/gl_init.h +++ b/engine/src/gldrv/gl_init.h @@ -2,7 +2,7 @@ * gl_init.h * * Copyright (C) 2001-2002 Daniel Horn - * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike + * Copyright (C) 2020-2023 pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike * contributors * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/gldrv/gl_light.h b/engine/src/gldrv/gl_light.h index d649236796..cd7f3826ae 100644 --- a/engine/src/gldrv/gl_light.h +++ b/engine/src/gldrv/gl_light.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/gldrv/gl_matrix.h b/engine/src/gldrv/gl_matrix.h index e08861ab35..6bf6c37791 100644 --- a/engine/src/gldrv/gl_matrix.h +++ b/engine/src/gldrv/gl_matrix.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/gldrv/gl_undefined_extensions.h b/engine/src/gldrv/gl_undefined_extensions.h index 8a236cbff5..becd84e03e 100644 --- a/engine/src/gldrv/gl_undefined_extensions.h +++ b/engine/src/gldrv/gl_undefined_extensions.h @@ -3,7 +3,7 @@ * * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors -* Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors +* Copyright (c) 2019-2023 Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike Contributors * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gldrv/glx_undefined_extensions.h b/engine/src/gldrv/glx_undefined_extensions.h index cb7551b759..134f383c94 100644 --- a/engine/src/gldrv/glx_undefined_extensions.h +++ b/engine/src/gldrv/glx_undefined_extensions.h @@ -3,7 +3,7 @@ * * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors -* Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors +* Copyright (c) 2019-2023 Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike Contributors * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gldrv/hashtable_3d.h b/engine/src/gldrv/hashtable_3d.h index 150712212e..600917cc9d 100644 --- a/engine/src/gldrv/hashtable_3d.h +++ b/engine/src/gldrv/hashtable_3d.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/gldrv/sdds.h b/engine/src/gldrv/sdds.h index 459ae9b331..8ee44708f4 100644 --- a/engine/src/gldrv/sdds.h +++ b/engine/src/gldrv/sdds.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/gldrv/winsys.h b/engine/src/gldrv/winsys.h index 5a95bb3b36..d52fe63c47 100644 --- a/engine/src/gldrv/winsys.h +++ b/engine/src/gldrv/winsys.h @@ -1,6 +1,7 @@ /* * Tux Racer * Copyright (C) 1999-2001 Jasmin F. Patry + * Copyright (C) 2023 Benjamen R. Meyer * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/engine/src/gnuhash.h b/engine/src/gnuhash.h index c56e74adca..42b3e68dc2 100644 --- a/engine/src/gnuhash.h +++ b/engine/src/gnuhash.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/gui/button.h b/engine/src/gui/button.h index 08c72f9673..14d266bc82 100644 --- a/engine/src/gui/button.h +++ b/engine/src/gui/button.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, David Ranger, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, David Ranger, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/gui/control.h b/engine/src/gui/control.h index 1ddd31f355..1d02ba6572 100644 --- a/engine/src/gui/control.h +++ b/engine/src/gui/control.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Mike Byron, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, Mike Byron, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/gui/eventmanager.h b/engine/src/gui/eventmanager.h index 24229f7dd6..0ae9b63b5b 100644 --- a/engine/src/gui/eventmanager.h +++ b/engine/src/gui/eventmanager.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Mike Byron, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Mike Byron, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gui/eventresponder.h b/engine/src/gui/eventresponder.h index f238849646..3da37f849a 100644 --- a/engine/src/gui/eventresponder.h +++ b/engine/src/gui/eventresponder.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Mike Byron, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Mike Byron, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gui/font.h b/engine/src/gui/font.h index 365f6007b7..e5a1758a42 100644 --- a/engine/src/gui/font.h +++ b/engine/src/gui/font.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Mike Byron, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Mike Byron, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gui/glut_support.h b/engine/src/gui/glut_support.h index f5ebfee4dc..62d419bbce 100644 --- a/engine/src/gui/glut_support.h +++ b/engine/src/gui/glut_support.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 David Ranger, Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 David Ranger, Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/gui/groupcontrol.h b/engine/src/gui/groupcontrol.h index 2ec946f6a5..9f21544f73 100644 --- a/engine/src/gui/groupcontrol.h +++ b/engine/src/gui/groupcontrol.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Mike Byron, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Mike Byron, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gui/guidefs.h b/engine/src/gui/guidefs.h index 4bce8ba716..01ae5926c1 100644 --- a/engine/src/gui/guidefs.h +++ b/engine/src/gui/guidefs.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Mike Byron, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Mike Byron, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gui/guitexture.h b/engine/src/gui/guitexture.h index ecdea24f20..add3610450 100644 --- a/engine/src/gui/guitexture.h +++ b/engine/src/gui/guitexture.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Mike Byron, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Mike Byron, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gui/modaldialog.h b/engine/src/gui/modaldialog.h index 65bb52340a..4326f43b5c 100644 --- a/engine/src/gui/modaldialog.h +++ b/engine/src/gui/modaldialog.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Mike Byron, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Mike Byron, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gui/newbutton.h b/engine/src/gui/newbutton.h index 9e5957ea28..2f34baa487 100644 --- a/engine/src/gui/newbutton.h +++ b/engine/src/gui/newbutton.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Mike Byron, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Mike Byron, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gui/painttext.h b/engine/src/gui/painttext.h index 4e5de3f6e4..4e803465f5 100644 --- a/engine/src/gui/painttext.h +++ b/engine/src/gui/painttext.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Mike Byron, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Mike Byron, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gui/picker.h b/engine/src/gui/picker.h index 2f11d50b4b..196eef8b07 100644 --- a/engine/src/gui/picker.h +++ b/engine/src/gui/picker.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Mike Byron, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Mike Byron, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gui/scroller.h b/engine/src/gui/scroller.h index 56dc9810be..546f8f44ae 100644 --- a/engine/src/gui/scroller.h +++ b/engine/src/gui/scroller.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Mike Byron, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Mike Byron, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gui/simplepicker.h b/engine/src/gui/simplepicker.h index 91bce1b0e8..70e6787b44 100644 --- a/engine/src/gui/simplepicker.h +++ b/engine/src/gui/simplepicker.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Mike Byron, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Mike Byron, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gui/slider.h b/engine/src/gui/slider.h index 7125ea293f..bc693b4841 100644 --- a/engine/src/gui/slider.h +++ b/engine/src/gui/slider.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Mike Byron, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Mike Byron, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gui/staticdisplay.h b/engine/src/gui/staticdisplay.h index 8479bbb778..586eacbe98 100644 --- a/engine/src/gui/staticdisplay.h +++ b/engine/src/gui/staticdisplay.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Mike Byron, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Mike Byron, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gui/text_area.h b/engine/src/gui/text_area.h index 70a52b6202..b232415aab 100644 --- a/engine/src/gui/text_area.h +++ b/engine/src/gui/text_area.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, David Ranger, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, David Ranger, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gui/textinputdisplay.h b/engine/src/gui/textinputdisplay.h index b5a7f9756f..c6dad6856d 100644 --- a/engine/src/gui/textinputdisplay.h +++ b/engine/src/gui/textinputdisplay.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Mike Byron, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Mike Byron, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gui/window.h b/engine/src/gui/window.h index 09080220bc..ce52118234 100644 --- a/engine/src/gui/window.h +++ b/engine/src/gui/window.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Mike Byron, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Mike Byron, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/gui/windowcontroller.h b/engine/src/gui/windowcontroller.h index 323354e327..386b8984e8 100644 --- a/engine/src/gui/windowcontroller.h +++ b/engine/src/gui/windowcontroller.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Mike Byron, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Mike Byron, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/hashtable.h b/engine/src/hashtable.h index 676328f51c..31160b84df 100644 --- a/engine/src/hashtable.h +++ b/engine/src/hashtable.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Alan Shieh, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Alan Shieh, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/heap.h b/engine/src/heap.h index eb0747f695..5ee62f10ee 100644 --- a/engine/src/heap.h +++ b/engine/src/heap.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Claudio Freire, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Claudio Freire, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/in.h b/engine/src/in.h index 99d3534003..97eff18a52 100644 --- a/engine/src/in.h +++ b/engine/src/in.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/in_handler.h b/engine/src/in_handler.h index 2fc8ed918d..c25602bafa 100644 --- a/engine/src/in_handler.h +++ b/engine/src/in_handler.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Alan Shieh, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Alan Shieh, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/in_joystick.h b/engine/src/in_joystick.h index eb8b2cf4e0..e51403aace 100644 --- a/engine/src/in_joystick.h +++ b/engine/src/in_joystick.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Alexander Rawass, pyramid3d, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Alexander Rawass, pyramid3d, + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/in_kb.h b/engine/src/in_kb.h index 76cd8a16bf..966a9b8c90 100644 --- a/engine/src/in_kb.h +++ b/engine/src/in_kb.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/in_kb_data.h b/engine/src/in_kb_data.h index da7328e4cc..7f41c2e764 100644 --- a/engine/src/in_kb_data.h +++ b/engine/src/in_kb_data.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/in_main.h b/engine/src/in_main.h index 49dd31a626..3cc70bbae2 100644 --- a/engine/src/in_main.h +++ b/engine/src/in_main.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/in_mouse.h b/engine/src/in_mouse.h index 1a035d1e30..819cd43b64 100644 --- a/engine/src/in_mouse.h +++ b/engine/src/in_mouse.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/lin_time.h b/engine/src/lin_time.h index a561a10cc8..3814107cbe 100644 --- a/engine/src/lin_time.h +++ b/engine/src/lin_time.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/linecollide.h b/engine/src/linecollide.h index 2e93661c5d..5acd481456 100644 --- a/engine/src/linecollide.h +++ b/engine/src/linecollide.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/load_mission.h b/engine/src/load_mission.h index 6b50693ae2..4aca0e3133 100644 --- a/engine/src/load_mission.h +++ b/engine/src/load_mission.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/macosx_math.h b/engine/src/macosx_math.h index ff2976d155..cccef2bc15 100644 --- a/engine/src/macosx_math.h +++ b/engine/src/macosx_math.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/main_loop.h b/engine/src/main_loop.h index 8af261f8f3..5e7b8c0f99 100644 --- a/engine/src/main_loop.h +++ b/engine/src/main_loop.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/mmorpgclient.h b/engine/src/mmorpgclient.h index b1ca70a03d..7ce773daa0 100644 --- a/engine/src/mmorpgclient.h +++ b/engine/src/mmorpgclient.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/options.h b/engine/src/options.h index 310528f22e..86d1f69ac9 100644 --- a/engine/src/options.h +++ b/engine/src/options.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/physics.h b/engine/src/physics.h index df4e7d3d3a..5866183481 100644 --- a/engine/src/physics.h +++ b/engine/src/physics.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/posh.h b/engine/src/posh.h index 5320a0767d..3a7ac8ffd7 100644 --- a/engine/src/posh.h +++ b/engine/src/posh.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/precompiled.h b/engine/src/precompiled.h index 50f5382bbf..ff806236da 100644 --- a/engine/src/precompiled.h +++ b/engine/src/precompiled.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/profile.h b/engine/src/profile.h index 1716919664..7cfd251867 100644 --- a/engine/src/profile.h +++ b/engine/src/profile.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/python/define_odd_unit_functions.h b/engine/src/python/define_odd_unit_functions.h index 8622cba515..f14449c5cf 100644 --- a/engine/src/python/define_odd_unit_functions.h +++ b/engine/src/python/define_odd_unit_functions.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/python/init.h b/engine/src/python/init.h index d5fea6edec..4c1cc705bc 100644 --- a/engine/src/python/init.h +++ b/engine/src/python/init.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/python/python_class.h b/engine/src/python/python_class.h index 85a5adacea..a43fa7e052 100644 --- a/engine/src/python/python_class.h +++ b/engine/src/python/python_class.h @@ -2,7 +2,7 @@ * python_class.h * * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Nachum Barcohen, - * Stephen G. Tuggy, and other Vega Strike contributors. + * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/python/python_compile.h b/engine/src/python/python_compile.h index cbe62edfb9..2da803aadf 100644 --- a/engine/src/python/python_compile.h +++ b/engine/src/python/python_compile.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/python/python_unit_wrap.h b/engine/src/python/python_unit_wrap.h index 1f7ffb81ea..677b664b91 100644 --- a/engine/src/python/python_unit_wrap.h +++ b/engine/src/python/python_unit_wrap.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/python/star_system_exports.h b/engine/src/python/star_system_exports.h index ad5b3eee80..71a6c3edb4 100644 --- a/engine/src/python/star_system_exports.h +++ b/engine/src/python/star_system_exports.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/python/unit_exports.h b/engine/src/python/unit_exports.h index 6d7c681341..158563978c 100644 --- a/engine/src/python/unit_exports.h +++ b/engine/src/python/unit_exports.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/python/unit_from_to_python.h b/engine/src/python/unit_from_to_python.h index a5210765d2..7ac44bb0f8 100644 --- a/engine/src/python/unit_from_to_python.h +++ b/engine/src/python/unit_from_to_python.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/python/unit_wrapper_class.h b/engine/src/python/unit_wrapper_class.h index f7d420b313..633eb16d00 100644 --- a/engine/src/python/unit_wrapper_class.h +++ b/engine/src/python/unit_wrapper_class.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/rendertext.h b/engine/src/rendertext.h index c3f119d3c2..f7b2a76dde 100644 --- a/engine/src/rendertext.h +++ b/engine/src/rendertext.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/resizable.h b/engine/src/resizable.h index 6bb361ad2f..86cc198878 100644 --- a/engine/src/resizable.h +++ b/engine/src/resizable.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/resource/product.h b/engine/src/resource/product.h index a1e98de556..d63d5e86eb 100644 --- a/engine/src/resource/product.h +++ b/engine/src/resource/product.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/resource/resource.h b/engine/src/resource/resource.h index 71e8cd81ce..4ef41759d1 100644 --- a/engine/src/resource/resource.h +++ b/engine/src/resource/resource.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/resource/store.h b/engine/src/resource/store.h index 2d2b5a12da..befc419b40 100644 --- a/engine/src/resource/store.h +++ b/engine/src/resource/store.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/save_util.h b/engine/src/save_util.h index ddb5bbbb69..fab6c7a91e 100644 --- a/engine/src/save_util.h +++ b/engine/src/save_util.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/savegame.h b/engine/src/savegame.h index c537130231..3f94011733 100644 --- a/engine/src/savegame.h +++ b/engine/src/savegame.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/ship_commands.h b/engine/src/ship_commands.h index 64efc17880..615125dd91 100644 --- a/engine/src/ship_commands.h +++ b/engine/src/ship_commands.h @@ -3,7 +3,7 @@ * * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors -* Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors +* Copyright (c) 2019-2023 Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike Contributors * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/star_system.h b/engine/src/star_system.h index a6d4683474..56425ecc23 100644 --- a/engine/src/star_system.h +++ b/engine/src/star_system.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/star_system_generic.h b/engine/src/star_system_generic.h index d164a25a66..31705c2fb6 100644 --- a/engine/src/star_system_generic.h +++ b/engine/src/star_system_generic.h @@ -3,7 +3,7 @@ * * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors -* Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors +* Copyright (c) 2019-2023 Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike Contributors * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/star_xml.h b/engine/src/star_xml.h index ba72c03375..bbaeaf9f7c 100644 --- a/engine/src/star_xml.h +++ b/engine/src/star_xml.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/stardate.h b/engine/src/stardate.h index f15a49a56a..302ff684f5 100644 --- a/engine/src/stardate.h +++ b/engine/src/stardate.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/system_factory.h b/engine/src/system_factory.h index 511b1a093f..1271491dff 100644 --- a/engine/src/system_factory.h +++ b/engine/src/system_factory.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/universe.h b/engine/src/universe.h index c69db54955..a4dcefa7b3 100644 --- a/engine/src/universe.h +++ b/engine/src/universe.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/universe_globals.h b/engine/src/universe_globals.h index 10290dab2c..d2dff2a307 100644 --- a/engine/src/universe_globals.h +++ b/engine/src/universe_globals.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/universe_util.h b/engine/src/universe_util.h index 7fad8cb7a3..97d9e29731 100644 --- a/engine/src/universe_util.h +++ b/engine/src/universe_util.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/vega_cast_utils.h b/engine/src/vega_cast_utils.h index ac2b5f4323..8a7db5477f 100644 --- a/engine/src/vega_cast_utils.h +++ b/engine/src/vega_cast_utils.h @@ -1,7 +1,7 @@ /* * vega_cast_utils.h * - * Copyright (C) 2001-2022 Daniel Horn, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/vega_py_run.h b/engine/src/vega_py_run.h index afd326e0c6..c04a8031fe 100644 --- a/engine/src/vega_py_run.h +++ b/engine/src/vega_py_run.h @@ -1,7 +1,7 @@ /* * vega_py_run.h * - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/vega_string_utils.h b/engine/src/vega_string_utils.h index 8eec7008b1..224f7625ec 100644 --- a/engine/src/vega_string_utils.h +++ b/engine/src/vega_string_utils.h @@ -1,7 +1,7 @@ /* * vega_string_utils.h * - * Copyright (C) 2001-2022 Daniel Horn, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/vegastrike.h b/engine/src/vegastrike.h index 5dab1d53cf..41fed397ea 100644 --- a/engine/src/vegastrike.h +++ b/engine/src/vegastrike.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/vs_exit.h b/engine/src/vs_exit.h index 24b0ccbfaa..5abdd639fa 100644 --- a/engine/src/vs_exit.h +++ b/engine/src/vs_exit.h @@ -1,7 +1,7 @@ /* * vs_exit.h * - * Copyright (C) 2001-2022 Daniel Horn, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/vs_globals.h b/engine/src/vs_globals.h index 1a592a693d..f9317f547d 100644 --- a/engine/src/vs_globals.h +++ b/engine/src/vs_globals.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/vs_logging.h b/engine/src/vs_logging.h index abc89652ba..d37bf2c971 100644 --- a/engine/src/vs_logging.h +++ b/engine/src/vs_logging.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Daniel Horn, Stephen G. Tuggy and + * Copyright (C) 2021-2023 Daniel Horn, Stephen G. Tuggy, Benjamen R. Meyer, and * other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/vs_math.h b/engine/src/vs_math.h index c3dadfe96e..83492b36cd 100644 --- a/engine/src/vs_math.h +++ b/engine/src/vs_math.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/vs_random.h b/engine/src/vs_random.h index b655b316c8..054c311a02 100644 --- a/engine/src/vs_random.h +++ b/engine/src/vs_random.h @@ -4,6 +4,7 @@ * Before using, initialize the state by using init_genrand(seed) * or init_by_array(init_key, key_length). * Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura, + * Copyright (C) 2023 Benjamen R. Meyer * All rights reserved. * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/engine/src/vs_vector.h b/engine/src/vs_vector.h index 7b00234b3f..e73d3d0a5b 100644 --- a/engine/src/vs_vector.h +++ b/engine/src/vs_vector.h @@ -1,7 +1,7 @@ /* * vs_vector.h * - * Copyright (C) 2001-2022 Daniel Horn, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/vsfilesystem.h b/engine/src/vsfilesystem.h index 8b024c4597..f6624c3059 100644 --- a/engine/src/vsfilesystem.h +++ b/engine/src/vsfilesystem.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Nachum Barcohen, Roy Falk, - * pyramid3d, Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Nachum Barcohen, Roy Falk, + * pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/src/xml_serializer.h b/engine/src/xml_serializer.h index 099cf098ed..11ca0dcfcd 100644 --- a/engine/src/xml_serializer.h +++ b/engine/src/xml_serializer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/src/xml_support.h b/engine/src/xml_support.h index 3ca1047662..c901b43671 100644 --- a/engine/src/xml_support.h +++ b/engine/src/xml_support.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/tools/common.h b/engine/tools/common.h index ac7cd5a23c..9b99647b84 100644 --- a/engine/tools/common.h +++ b/engine/tools/common.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Konstantinos Arvanitis, - * pyramid3d, Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Konstantinos Arvanitis, + * pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/tools/vsrtools.h b/engine/tools/vsrtools.h index 60c2a60800..72eb91e361 100644 --- a/engine/tools/vsrtools.h +++ b/engine/tools/vsrtools.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, Konstantinos Arvanitis, - * pyramid3d, Stephen G. Tuggy, and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, Konstantinos Arvanitis, + * pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/vs_cubemap_gen/src/color/color.h b/engine/vs_cubemap_gen/src/color/color.h index 5adf47b880..16e978342f 100644 --- a/engine/vs_cubemap_gen/src/color/color.h +++ b/engine/vs_cubemap_gen/src/color/color.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/vs_cubemap_gen/src/command/command.h b/engine/vs_cubemap_gen/src/command/command.h index d3e693817d..1a6b4ed15e 100644 --- a/engine/vs_cubemap_gen/src/command/command.h +++ b/engine/vs_cubemap_gen/src/command/command.h @@ -3,7 +3,7 @@ * * Copyright (c) 2001-2002 Daniel Horn * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors -* Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors +* Copyright (c) 2019-2023 Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike Contributors * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/vs_cubemap_gen/src/errors/errors.h b/engine/vs_cubemap_gen/src/errors/errors.h index 7bf4de9e21..3ca9da7ae6 100644 --- a/engine/vs_cubemap_gen/src/errors/errors.h +++ b/engine/vs_cubemap_gen/src/errors/errors.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/vs_cubemap_gen/src/file_io/file_io.h b/engine/vs_cubemap_gen/src/file_io/file_io.h index d0eba9aff7..2bc500478c 100644 --- a/engine/vs_cubemap_gen/src/file_io/file_io.h +++ b/engine/vs_cubemap_gen/src/file_io/file_io.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, - * and other Vega Strike contributors. + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Benjamen R. Meyer, and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source * diff --git a/engine/vs_cubemap_gen/src/filter/filter.h b/engine/vs_cubemap_gen/src/filter/filter.h index ccb6125181..06ccbfadef 100644 --- a/engine/vs_cubemap_gen/src/filter/filter.h +++ b/engine/vs_cubemap_gen/src/filter/filter.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/vs_cubemap_gen/src/filter/filter_impl/filter_math.h b/engine/vs_cubemap_gen/src/filter/filter_impl/filter_math.h index 3e18e8d70f..9c83065d74 100644 --- a/engine/vs_cubemap_gen/src/filter/filter_impl/filter_math.h +++ b/engine/vs_cubemap_gen/src/filter/filter_impl/filter_math.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/vs_cubemap_gen/src/filter/filter_impl/filter_one_texel.h b/engine/vs_cubemap_gen/src/filter/filter_impl/filter_one_texel.h index 567698033b..b13a2ad05e 100644 --- a/engine/vs_cubemap_gen/src/filter/filter_impl/filter_one_texel.h +++ b/engine/vs_cubemap_gen/src/filter/filter_impl/filter_one_texel.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/vs_cubemap_gen/src/filter/filter_settings.h b/engine/vs_cubemap_gen/src/filter/filter_settings.h index f2ca0fa671..be857dea93 100644 --- a/engine/vs_cubemap_gen/src/filter/filter_settings.h +++ b/engine/vs_cubemap_gen/src/filter/filter_settings.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/vs_cubemap_gen/src/first.h b/engine/vs_cubemap_gen/src/first.h index 22c9ced0f2..c78a581574 100644 --- a/engine/vs_cubemap_gen/src/first.h +++ b/engine/vs_cubemap_gen/src/first.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/vs_cubemap_gen/src/fvector/fvector.h b/engine/vs_cubemap_gen/src/fvector/fvector.h index 7f7feb61b6..cffc7e9e72 100644 --- a/engine/vs_cubemap_gen/src/fvector/fvector.h +++ b/engine/vs_cubemap_gen/src/fvector/fvector.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/vs_cubemap_gen/src/process/process.h b/engine/vs_cubemap_gen/src/process/process.h index 82d20bbf12..32dcbf0423 100644 --- a/engine/vs_cubemap_gen/src/process/process.h +++ b/engine/vs_cubemap_gen/src/process/process.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/vs_cubemap_gen/src/settings/settings.h b/engine/vs_cubemap_gen/src/settings/settings.h index e3624d0819..bf548810b4 100644 --- a/engine/vs_cubemap_gen/src/settings/settings.h +++ b/engine/vs_cubemap_gen/src/settings/settings.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/vs_cubemap_gen/src/texture/mem_texture.h b/engine/vs_cubemap_gen/src/texture/mem_texture.h index e7855f89ff..13f9225ab7 100644 --- a/engine/vs_cubemap_gen/src/texture/mem_texture.h +++ b/engine/vs_cubemap_gen/src/texture/mem_texture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/vs_cubemap_gen/src/texture/mem_texture_impl/coords.h b/engine/vs_cubemap_gen/src/texture/mem_texture_impl/coords.h index 6f2032397d..204bad9f29 100644 --- a/engine/vs_cubemap_gen/src/texture/mem_texture_impl/coords.h +++ b/engine/vs_cubemap_gen/src/texture/mem_texture_impl/coords.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/vs_cubemap_gen/src/texture/mem_texture_impl/side.h b/engine/vs_cubemap_gen/src/texture/mem_texture_impl/side.h index 92b47ea9cf..87fe75ce6c 100644 --- a/engine/vs_cubemap_gen/src/texture/mem_texture_impl/side.h +++ b/engine/vs_cubemap_gen/src/texture/mem_texture_impl/side.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/vs_cubemap_gen/src/texture/texture_settings.h b/engine/vs_cubemap_gen/src/texture/texture_settings.h index bb6ea66f51..ce607f7170 100644 --- a/engine/vs_cubemap_gen/src/texture/texture_settings.h +++ b/engine/vs_cubemap_gen/src/texture/texture_settings.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source diff --git a/engine/vs_cubemap_gen/src/units/units.h b/engine/vs_cubemap_gen/src/units/units.h index 2e14aca0bb..bded24ce3b 100644 --- a/engine/vs_cubemap_gen/src/units/units.h +++ b/engine/vs_cubemap_gen/src/units/units.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy, + * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer, * and other Vega Strike contributors. * * https://github.com/vegastrike/Vega-Strike-Engine-Source