Ratstail91/Tortuga
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Looking for the bug

Browse Source
This commit is contained in:
Kayne Ruse
2015-04-27 01:33:57 +10:00
parent 2a1ee4acbf
commit 878d502b8b
10 changed files with 28 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/gameplay_scenes/makefile
+1 -1
View File
@@ -1,5 +1,5 @@
#config
INCLUDES+=. .. ../client_utilities ../entities ../../common/debugging ../../common/gameplay ../../common/graphics ../../common/map ../../common/network ../../common/network/packet_types ../../common/ui ../../common/utilities
INCLUDES+=. .. ../client_utilities ../entities ../../common/gameplay ../../common/graphics ../../common/map ../../common/network ../../common/network/packet_types ../../common/ui ../../common/utilities
LIBS+=
CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
client/gameplay_scenes/world_logic.cpp
+1 -1
View File
@@ -152,7 +152,7 @@ void World::FrameEnd() {
}
void World::RenderFrame() {
SDL_FillRect(GetScreen(), 0, 0);
// SDL_FillRect(GetScreen(), 0, 0);
Render(GetScreen());
SDL_Flip(GetScreen());
fps.Calculate();
client/gameplay_scenes/world_map.cpp
+21 -11
View File
@@ -22,18 +22,30 @@
#include "world.hpp"
#include "channels.hpp"
#include "region_checksum.hpp"
#include <iostream>
//-------------------------
//static functions
//-------------------------
static int regionChecksum(Region* const region) {
int sum = 0;
for(int i = 0; i < REGION_WIDTH; i++) {
for (int j = 0; j < REGION_HEIGHT; j++) {
for (int k = 0; k < REGION_DEPTH; k++) {
sum += region->GetTile(i, j, k);
}
}
}
return sum;
}
//-------------------------
//map management
//-------------------------
void World::SendRegionRequest(int roomIndex, int x, int y) {
//debugging
// std::cout << "SendRegionRequest(" << roomIndex << ", " << x << ", " << y << ")" << std::endl;
RegionPacket packet;
//pack the region's data
@@ -50,7 +62,7 @@ void World::hRegionContent(RegionPacket* const argPacket) {
std::cout << "hRegionContent(" << roomIndex << ", " << argPacket->x << ", " << argPacket->y << ")" << std::endl;
//checksum
if (debugRegionSum(argPacket->region) == 0) {
if (regionChecksum(argPacket->region) == 0) {
std::cout << "Received checksum failed: " << argPacket->x << ", " << argPacket->y << std::endl;
}
@@ -86,14 +98,12 @@ void World::UpdateMap() {
for (int i = xStart; i <= xEnd; i += REGION_WIDTH) {
for (int j = yStart; j <= yEnd; j += REGION_HEIGHT) {
Region* region = regionPager.FindRegion(i, j);
if (!region || debugRegionSum(region) == 0) {
if (!region) {
SendRegionRequest(roomIndex, i, j);
}
else {
//checksum
if (debugRegionSum(regionPager.FindRegion(i, j)) == 0) {
std::cout << "Existing checksum failed: " << roomIndex << ", " << i << ", " << j << std::endl;
}
else if (regionChecksum(region) == 0) {
std::cout << "Existing checksum failed: " << roomIndex << ", " << i << ", " << j << std::endl;
SendRegionRequest(roomIndex, i, j);
}
}
}