Digitalstack/SabrehavenServer
2
0
Fork 0
mirror of https://github.com/ErikasKontenis/SabrehavenServer.git synced 2025-12-28 19:47:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

introduce changes from streamside fork

Browse Source
This commit is contained in:
ErikasKontenis
2019-09-16 20:38:16 +03:00
parent f2cbc2dc1c
commit ad03b0eb3e
162 changed files with 2485 additions and 698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/game.h
View File

@@ -1,6 +1,6 @@
/**
* Tibia GIMUD Server - a free and open-source MMORPG server emulator
* Copyright (C) 2017 Alejandro Mujica <alejandrodemujica@gmail.com>
* Copyright (C) 2019 Sabrehaven and Mark Samman <mark.samman@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -22,7 +22,6 @@
#include "account.h"
#include "combat.h"
#include "commands.h"
#include "groups.h"
#include "map.h"
#include "position.h"
@@ -436,7 +435,7 @@ class Game
void combatGetTypeInfo(CombatType_t combatType, Creature* target, TextColor_t& color, uint8_t& effect);
bool combatChangeHealth(Creature* attacker, Creature* target, CombatDamage& damage);
bool combatChangeMana(Creature* attacker, Creature* target, int32_t manaChange);
bool combatChangeMana(Creature* attacker, Creature* target, CombatDamage& damage);
//animation help functions
void addCreatureHealth(const Creature* target);
@@ -449,9 +448,6 @@ class Game
static void addAnimatedText(const SpectatorVec& list, const Position& pos, uint8_t color, const std::string& text);
void addMonsterSayText(const Position& pos, const std::string& text);
void addCommandTag(char tag);
void resetCommandTag();
void startDecay(Item* item);
int32_t getLightHour() const {
return lightHour;
@@ -488,13 +484,13 @@ class Game
BedItem* getBedBySleeper(uint32_t guid) const;
void setBedSleeper(BedItem* bed, uint32_t guid);
void removeBedSleeper(uint32_t guid);
bool reload(ReloadTypes_t reloadType);
Groups groups;
Map map;
Raids raids;
protected:
bool playerSayCommand(Player* player, const std::string& text);
bool playerSaySpell(Player* player, SpeakClasses type, const std::string& text);
void playerWhisper(Player* player, const std::string& text);
bool playerYell(Player* player, const std::string& text);
@@ -518,7 +514,6 @@ class Game
std::vector<Creature*> ToReleaseCreatures;
std::vector<Item*> ToReleaseItems;
std::vector<char> commandTags;
size_t lastBucket = 0;
@@ -532,8 +527,6 @@ class Game
std::map<uint32_t, BedItem*> bedSleepersMap;
Commands commands;
static constexpr int32_t LIGHT_LEVEL_DAY = 250;
static constexpr int32_t LIGHT_LEVEL_NIGHT = 40;
static constexpr int32_t SUNSET = 1305;