Permalink
Browse files

Merge a vast amount of small changes from develop into maintenance

This basically merges various changes that I don't think will be included with cherry-pick.

This has been merged manually by using a Folder diff and merge tool (meld) with very little typing.
All of these changes exist in the develop branch.
Most of the changes are obvious NLC (syntax cleanup, NULL->nullptr and similar).
In the case of more complex changes, those are bits of code contained in develop that I think should be included in maintenance and tested ASAP.

The purpose of this was to make the eventual switch to develop less open to (non-GL) bugs.
If there are any unwanted difference in behavior caused by this, please fix it through develop first.
  • Loading branch information...
gajop committed Nov 17, 2018
1 parent 06a7c46 commit 063ed815f049572cc6ce4cb200c660c2e4eb7f6c
Showing with 826 additions and 825 deletions.
  1. +3 −3 rts/ExternalAI/AICallback.cpp
  2. +2 −2 rts/Game/GameHelper.cpp
  3. +0 −1 rts/Game/LoadScreen.cpp
  4. +399 −330 rts/Game/UnsyncedGameCommands.cpp
  5. +22 −22 rts/Game/WaitCommandsAI.cpp
  6. +2 −0 rts/Lua/LuaConstGL.cpp
  7. +3 −4 rts/Lua/LuaFonts.cpp
  8. +1 −2 rts/Lua/LuaHandleSynced.cpp
  9. +20 −19 rts/Lua/LuaMaterial.cpp
  10. +7 −8 rts/Lua/LuaObjectRendering.cpp
  11. +1 −2 rts/Lua/LuaOpenGL.cpp
  12. +2 −3 rts/Lua/LuaOpenGLUtils.cpp
  13. +3 −3 rts/Lua/LuaShaders.cpp
  14. +1 −1 rts/Lua/LuaSyncedCtrl.cpp
  15. +2 −2 rts/Lua/LuaTextures.cpp
  16. +16 −35 rts/Lua/LuaUnsyncedCtrl.cpp
  17. +30 −25 rts/Lua/LuaUnsyncedRead.cpp
  18. +2 −30 rts/Lua/LuaUtils.cpp
  19. +3 −6 rts/Map/Generation/SimpleMapGenerator.cpp
  20. +1 −3 rts/Map/HeightMapTexture.cpp
  21. +6 −6 rts/Map/MapInfo.cpp
  22. +1 −3 rts/Map/ReadMap.cpp
  23. +4 −5 rts/Map/SMF/SMFMapFile.cpp
  24. +4 −5 rts/Map/SMF/SMFReadMap.cpp
  25. +13 −14 rts/Menu/SelectMenu.cpp
  26. +9 −7 rts/Menu/SelectionWidget.cpp
  27. +25 −22 rts/Rendering/DebugDrawerAI.cpp
  28. +4 −0 rts/Rendering/Env/AdvWater.cpp
  29. +10 −13 rts/Rendering/Env/BumpWater.cpp
  30. +9 −9 rts/Rendering/Env/Decals/DecalsDrawerGL4.cpp
  31. +8 −9 rts/Rendering/Env/Decals/GroundDecalHandler.cpp
  32. +3 −4 rts/Rendering/Env/Particles/Classes/BitmapMuzzleFlame.cpp
  33. +1 −2 rts/Rendering/Env/Particles/Classes/BubbleProjectile.cpp
  34. +0 −1 rts/Rendering/Env/Particles/Classes/DirtProjectile.cpp
  35. +1 −2 rts/Rendering/Env/Particles/Classes/ExploSpikeProjectile.cpp
  36. +2 −2 rts/Rendering/Env/Particles/Classes/GenericParticleProjectile.cpp
  37. +1 −3 rts/Rendering/Env/Particles/Classes/HeatCloudProjectile.cpp
  38. +1 −1 rts/Rendering/Env/Particles/Classes/MuzzleFlame.cpp
  39. +2 −2 rts/Rendering/Env/Particles/Classes/NanoProjectile.cpp
  40. +4 −4 rts/Rendering/Env/Particles/Classes/ShieldSegmentProjectile.cpp
  41. +6 −6 rts/Rendering/Env/Particles/Classes/SimpleParticleSystem.cpp
  42. +0 −2 rts/Rendering/Env/Particles/Classes/SmokeProjectile.cpp
  43. +0 −1 rts/Rendering/Env/Particles/Classes/SmokeProjectile2.cpp
  44. +1 −2 rts/Rendering/Env/Particles/Classes/SpherePartProjectile.cpp
  45. +4 −3 rts/Rendering/Env/SkyBox.h
  46. +1 −1 rts/Rendering/FarTextureHandler.cpp
  47. +5 −5 rts/Rendering/FeatureDrawer.cpp
  48. +36 −44 rts/Rendering/Fonts/CFontTexture.cpp
  49. +2 −2 rts/Rendering/Fonts/CFontTexture.h
  50. +3 −3 rts/Rendering/Fonts/TextWrap.cpp
  51. +2 −2 rts/Rendering/GlobalRendering.h
  52. +1 −1 rts/Rendering/GroundFlash.cpp
  53. +1 −3 rts/Rendering/HUDDrawer.cpp
  54. +11 −11 rts/Rendering/IconHandler.cpp
  55. +1 −1 rts/Rendering/InMapDrawView.cpp
  56. +4 −4 rts/Rendering/LuaObjectDrawer.cpp
  57. +1 −2 rts/Rendering/Map/InfoTexture/IInfoTextureHandler.h
  58. +0 −1 rts/Rendering/Map/InfoTexture/InfoTexture.cpp
  59. +1 −1 rts/Rendering/Map/InfoTexture/Modern/InfoTextureHandler.cpp
  60. +18 −17 rts/Rendering/Map/InfoTexture/Modern/Path.cpp
  61. +5 −5 rts/Rendering/Models/3DModel.cpp
  62. +2 −1 rts/Rendering/Models/3DOParser.cpp
  63. +1 −1 rts/Rendering/Models/AssIO.cpp
  64. +1 −1 rts/Rendering/Models/AssIO.h
  65. +6 −7 rts/Rendering/Models/AssParser.cpp
  66. +5 −7 rts/Rendering/Models/IModelParser.cpp
  67. +2 −2 rts/Rendering/Textures/ColorMap.cpp
  68. +2 −2 rts/Rendering/Textures/LegacyAtlasAlloc.cpp
  69. +7 −6 rts/Rendering/Textures/NamedTextures.cpp
  70. +13 −13 rts/Rendering/Textures/QuadtreeAtlasAlloc.cpp
  71. +2 −2 rts/Rendering/Textures/RowAtlasAlloc.cpp
  72. +1 −1 rts/Rendering/WorldDrawer.cpp
  73. +41 −31 rts/Sim/Misc/Team.cpp
  74. +5 −5 rts/Sim/Path/Default/PathEstimator.h
  75. +0 −2 rts/Sim/Units/UnitDefHandler.cpp
  76. +1 −1 rts/Sim/Units/UnitDefHandler.h
  77. +2 −6 rts/System/EventHandler.h
  78. +3 −4 rts/System/Rectangle.h
  79. +1 −1 test/README.md
@@ -1567,12 +1567,12 @@ bool CAICallback::IsDebugDrawerEnabled() const
return debugDrawerAI->GetDraw();
}
int CAICallback::GetNumUnitDefs ()
int CAICallback::GetNumUnitDefs()
{
return (unitDefHandler->NumUnitDefs());
}
void CAICallback::GetUnitDefList (const UnitDef** list)
void CAICallback::GetUnitDefList(const UnitDef** list)
{
for (unsigned int i = 0, n = unitDefHandler->NumUnitDefs(); i < n; i++) {
list[i] = unitDefHandler->GetUnitDefByID(i + 1);
@@ -1583,7 +1583,7 @@ void CAICallback::GetUnitDefList (const UnitDef** list)
float CAICallback::GetUnitDefRadius(int def)
{
const UnitDef* ud = unitDefHandler->GetUnitDefByID(def);
S3DModel* mdl = ud->LoadModel();
const S3DModel* mdl = ud->LoadModel();
return mdl->radius;
}
@@ -1042,8 +1042,8 @@ float CGameHelper::GetBuildHeight(const float3& pos, const UnitDef* unitdef, boo
// restrict the range of [minH, maxH] to
// the minimum and maximum square height
// within the footprint
if (minHgt < (sqMinHgt - maxDifHgt)) { minHgt = sqMinHgt - maxDifHgt; }
if (maxHgt > (sqMaxHgt + maxDifHgt)) { maxHgt = sqMaxHgt + maxDifHgt; }
minHgt = std::max(minHgt, sqMinHgt - maxDifHgt);
maxHgt = std::min(maxHgt, sqMaxHgt + maxDifHgt);
}
}
@@ -20,7 +20,6 @@
#include "Sim/Misc/TeamHandler.h"
#include "Sim/Path/IPathManager.h"
#include "System/Config/ConfigHandler.h"
#include "System/EventHandler.h"
#include "System/Exceptions.h"
#include "System/Sync/FPUCheck.h"
#include "System/Log/ILog.h"
Oops, something went wrong.

0 comments on commit 063ed81

Please sign in to comment.