Skip to content

Commit

Permalink
- fix compile error
Browse files Browse the repository at this point in the history
  • Loading branch information
SoapyMan committed Sep 14, 2022
1 parent 714a054 commit 538b78a
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 11 deletions.
13 changes: 6 additions & 7 deletions game/pch.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
#include "core/ignore_vc_new.h"
//#include <sol/forward.hpp>
#include <sol/sol.hpp>

#include "core/dktypes.h"
#include "core/cmdlib.h"
#include "core/VirtualStream.h"
#include "core/FileStream.h"

#include <nstd/Memory.hpp>
#include <nstd/Array.hpp>
#include <nstd/HashSet.hpp>
Expand All @@ -20,6 +14,11 @@
#include <nstd/Thread.hpp>
#include <nstd/RefCount.hpp>

#include "core/dktypes.h"
#include "core/cmdlib.h"
#include "core/VirtualStream.h"
#include "core/FileStream.h"

#include "routines/d2_types.h"
#include "routines/models.h"
#include "routines/regions.h"
Expand Down
5 changes: 5 additions & 0 deletions game/scripts/test_game.lua
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,11 @@ TestGame.Init = function(residentModel)

players.localPlayer:InitReplay(nil)
players.localPlayer.currentCar = plcar

--players.localPlayer.rubberbandMode = RubberbandMode.Chaser
--players.localPlayer.rubberbandPoint = positionInfo.position
--players.localPlayer.rubberbandPowerRatio = 4096

local maxMusic = #cityStart.musicType
Music.Init(CurrentCityInfo.gameId, cityStart.musicType[(CurrentSkyType % maxMusic) + 1] + 1)
Music.FunkUpDaBGMTunez(false)
Expand Down
2 changes: 1 addition & 1 deletion game/shared/camera.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define CAMERA_H

#include "math/Vector.h"
#include <sol/forward.hpp>


//---------------------------------------------------------

Expand Down
3 changes: 0 additions & 3 deletions premake5.lua
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@ group "Dependencies"
project "libnstd"
kind "StaticLib"

filter "system:Windows"
defines { "__PLACEMENT_NEW_INLINE" }

includedirs {
"dependencies/libnstd/include"
}
Expand Down
1 change: 1 addition & 0 deletions renderer/mesh_builder.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef MESH_BUILDER_H
#define MESH_BUILDER_H

#include <string.h>
#include "gl_renderer.h"

class CMeshBuilder
Expand Down

0 comments on commit 538b78a

Please sign in to comment.