bionickatana/starruler-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #51 from Michael-Phoenix/master

Browse Source 
Fix for "front() called on empty vector" Errors on debug builds.
This commit is contained in:
Lucas de Vries
2018-09-26 20:18:14 +02:00
committed by GitHub
parent 6e97ea92a7 9481d94c98
commit a8def84fc9
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/game/design/design.cpp
+2 -2
View File
@@ -824,7 +824,7 @@ Design::Design(SaveFile& file) : initialized(true), data(nullptr), clientData(nu
unsigned hexesCount = file; unsigned hexesCount = file;
hexes.resize(hexesCount); hexes.resize(hexesCount);
file.read(&hexes.front(), sizeof(vec2u) * hexesCount); file.read(hexes.data(), sizeof(vec2u) * hexesCount);
cropMin = vec2u(grid.width, grid.height); cropMin = vec2u(grid.width, grid.height);
cropMax = vec2u(0, 0); cropMax = vec2u(0, 0);
@@ -948,7 +948,7 @@ void Design::save(SaveFile& file) const {
file.write(hexStatusIndex.data, sizeof(int) * hexStatusIndex.width * hexStatusIndex.height); file.write(hexStatusIndex.data, sizeof(int) * hexStatusIndex.width * hexStatusIndex.height);
file << (unsigned)hexes.size(); file << (unsigned)hexes.size();
file.write(&hexes.front(), sizeof(vec2u) * (unsigned)hexes.size()); file.write(hexes.data(), sizeof(vec2u) * (unsigned)hexes.size());
unsigned cnt = getShipVariableCount(); unsigned cnt = getShipVariableCount();
file << cnt; file << cnt;
source/game/design/subsystem.cpp
+2 -2
View File
@@ -3646,7 +3646,7 @@ void Subsystem::init(SaveFile& file) {
unsigned hexCount = file; unsigned hexCount = file;
hexes.resize(hexCount); hexes.resize(hexCount);
file.read(&hexes.front(), hexes.size() * sizeof(vec2u)); file.read(hexes.data(), hexes.size() * sizeof(vec2u));
hexEffects.resize(hexCount); hexEffects.resize(hexCount);
if(file >= SFV_0010) { if(file >= SFV_0010) {
@@ -3799,7 +3799,7 @@ void Subsystem::save(SaveFile& file) const {
file << dataOffset; file << dataOffset;
file << unsigned(hexes.size()); file << unsigned(hexes.size());
file.write(&hexes.front(), hexes.size() * sizeof(vec2u)); file.write(hexes.data(), hexes.size() * sizeof(vec2u));
for(unsigned i = 0; i < hexes.size(); ++i) { for(unsigned i = 0; i < hexes.size(); ++i) {
file << (unsigned)hexEffects[i].size(); file << (unsigned)hexEffects[i].size();
source/game/render/bmf_loader.cpp
+3 -3
View File
@@ -92,7 +92,7 @@ void loadBinaryMesh(const char* filename, Mesh& mesh) {
return; return;
vertices.resize(count); vertices.resize(count);
file.read((char*)&vertices.front(), sizeof(vec3f) * count); file.read((char*)vertices.data(), sizeof(vec3f) * count);
//Normals //Normals
file.read((char*)&count, sizeof(count)); file.read((char*)&count, sizeof(count));
@@ -100,7 +100,7 @@ void loadBinaryMesh(const char* filename, Mesh& mesh) {
return; return;
normals.resize(count); normals.resize(count);
file.read((char*)&normals.front(), sizeof(vec3f) * count); file.read((char*)normals.data(), sizeof(vec3f) * count);
//UVs //UVs
file.read((char*)&count, sizeof(count)); file.read((char*)&count, sizeof(count));
@@ -108,7 +108,7 @@ void loadBinaryMesh(const char* filename, Mesh& mesh) {
return; return;
uvs.resize(count); uvs.resize(count);
file.read((char*)&uvs.front(), sizeof(UV) * count); file.read((char*)uvs.data(), sizeof(UV) * count);
//Faces //Faces
file.read((char*)&count, sizeof(count)); file.read((char*)&count, sizeof(count));
source/game/render/gl_vertexBuffer.cpp
+1 -1
View File
@@ -237,7 +237,7 @@ namespace render {
bufferFlushes += 1; bufferFlushes += 1;
vbFlushCounts[reason] += 1; vbFlushCounts[reason] += 1;
RenderStep* pSteps = &steps.front(); RenderStep* pSteps = steps.data();
for(unsigned i = 0, cnt = (unsigned)steps.size(); i < cnt; ++i) { for(unsigned i = 0, cnt = (unsigned)steps.size(); i < cnt; ++i) {
auto& step = pSteps[i]; auto& step = pSteps[i];
shaderUniforms = step.shaderCache; shaderUniforms = step.shaderCache;