introduce changes from streamside fork

src/enums.h

@@ -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
@@ -345,6 +345,11 @@ enum ReturnValue {
 	RETURNVALUE_CANONLYUSEONESHIELD,
 	RETURNVALUE_NOPARTYMEMBERSINRANGE,
 	RETURNVALUE_YOUARENOTTHEOWNER,
+	RETURNVALUE_TRADEPLAYERFARAWAY,
+	RETURNVALUE_YOUDONTOWNTHISHOUSE,
+	RETURNVALUE_TRADEPLAYERALREADYOWNSAHOUSE,
+	RETURNVALUE_TRADEPLAYERHIGHESTBIDDER,
+	RETURNVALUE_YOUCANNOTTRADETHISHOUSE,
 };
 
 struct Outfit_t {
@@ -363,15 +368,26 @@ struct LightInfo {
 	constexpr LightInfo(uint8_t level, uint8_t color) : level(level), color(color) {}
 };
 
+enum CombatOrigin
+{
+	ORIGIN_NONE,
+	ORIGIN_CONDITION,
+	ORIGIN_SPELL,
+	ORIGIN_MELEE,
+	ORIGIN_RANGED,
+};
+
 struct CombatDamage
 {
 	CombatType_t type;
 	int32_t value;
 	int32_t min;
 	int32_t max;
+	CombatOrigin origin;
 
 	CombatDamage()
 	{
+		origin = ORIGIN_NONE;
 		type = COMBAT_NONE;
 		value = 0;
 		min = 0;