Kayne Ruse
b47191a0c1
Coordinates are supposed to be stored by their x & y, but the sizes of the tile sheets were getting mixed in as well. When trying to store a region at (0, 20), it was being stored at (0, 260). Another visual bug inside the tile sheet's rendering function masked this issue until now. Another thing to note is that I've removed an incredibly complex system for updating the client's map. The new system may seem complex at first, but it is straight forward compared to what it replaced. I've also fixed a few logarithmic lagging points in the code.
122 lines
2.9 KiB
C++
122 lines
2.9 KiB
C++
/* Copyright: (c) Kayne Ruse 2013
|
|
*
|
|
* This software is provided 'as-is', without any express or implied
|
|
* warranty. In no event will the authors be held liable for any damages
|
|
* arising from the use of this software.
|
|
*
|
|
* Permission is granted to anyone to use this software for any purpose,
|
|
* including commercial applications, and to alter it and redistribute it
|
|
* freely, subject to the following restrictions:
|
|
*
|
|
* 1. The origin of this software must not be misrepresented; you must not
|
|
* claim that you wrote the original software. If you use this software
|
|
* in a product, an acknowledgment in the product documentation would be
|
|
* appreciated but is not required.
|
|
*
|
|
* 2. Altered source versions must be plainly marked as such, and must not be
|
|
* misrepresented as being the original software.
|
|
*
|
|
* 3. This notice may not be removed or altered from any source
|
|
* distribution.
|
|
*/
|
|
#ifndef INWORLD_HPP_
|
|
#define INWORLD_HPP_
|
|
|
|
//maps
|
|
#include "map_allocator.hpp"
|
|
#include "map_file_format.hpp"
|
|
#include "region_pager.hpp"
|
|
|
|
//networking
|
|
#include "udp_network_utility.hpp"
|
|
#include "serial_packet.hpp"
|
|
#include "serial.hpp"
|
|
|
|
//graphics
|
|
#include "image.hpp"
|
|
#include "raster_font.hpp"
|
|
#include "button.hpp"
|
|
#include "tile_sheet.hpp"
|
|
|
|
//common
|
|
#include "config_utility.hpp"
|
|
#include "frame_rate.hpp"
|
|
|
|
//client
|
|
#include "base_scene.hpp"
|
|
#include "player_character.hpp"
|
|
|
|
//STL
|
|
#include <map>
|
|
|
|
class InWorld : public BaseScene {
|
|
public:
|
|
//Public access members
|
|
InWorld(ConfigUtility* const, UDPNetworkUtility* const, int* const);
|
|
~InWorld();
|
|
|
|
protected:
|
|
//Frame loop
|
|
void FrameStart();
|
|
void Update(double delta);
|
|
void FrameEnd();
|
|
void RenderFrame();
|
|
void Render(SDL_Surface* const);
|
|
|
|
//Event handlers
|
|
void QuitEvent();
|
|
void MouseMotion(SDL_MouseMotionEvent const&);
|
|
void MouseButtonDown(SDL_MouseButtonEvent const&);
|
|
void MouseButtonUp(SDL_MouseButtonEvent const&);
|
|
void KeyDown(SDL_KeyboardEvent const&);
|
|
void KeyUp(SDL_KeyboardEvent const&);
|
|
|
|
//Network handlers
|
|
void HandlePacket(SerialPacket);
|
|
void HandleDisconnect(SerialPacket);
|
|
void HandlePlayerNew(SerialPacket);
|
|
void HandlePlayerDelete(SerialPacket);
|
|
void HandlePlayerUpdate(SerialPacket);
|
|
void HandleRegionContent(SerialPacket);
|
|
|
|
//Server control
|
|
void SendState();
|
|
void RequestDisconnect();
|
|
void RequestShutDown();
|
|
void RequestRegion(int x, int y);
|
|
|
|
//utilities
|
|
void UpdateMap();
|
|
|
|
//globals
|
|
ConfigUtility& config;
|
|
FrameRate fps;
|
|
UDPNetworkUtility& network;
|
|
int& clientIndex;
|
|
|
|
//graphics
|
|
Image buttonImage;
|
|
RasterFont font;
|
|
TileSheet tileSheet;
|
|
|
|
//map
|
|
RegionPager<BlankAllocator, DummyFormat> regionPager;
|
|
|
|
//UI
|
|
Button disconnectButton;
|
|
Button shutDownButton;
|
|
//TODO: Fix the camera
|
|
struct {
|
|
int x = 0, y = 0;
|
|
int width = 0, height = 0;
|
|
int marginX = 0, marginY = 0;
|
|
} camera;
|
|
|
|
//game
|
|
std::map<int, PlayerCharacter> playerCharacters;
|
|
PlayerCharacter* localCharacter = nullptr;
|
|
int playerIndex = -1;
|
|
};
|
|
|
|
#endif
|