Mercurial > mm7

changeset 939:9be9afdbeac3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stru351 moved
author Nomad
date Wed, 01 May 2013 13:52:09 +0200
parents 016e3577865c
children 4dd4184d4248
files Items.h UIBooks.cpp UICharacter.cpp UIMainMenu.cpp UIOptions.cpp UIPartyCreation.cpp UIPopup.cpp UIRest.cpp UISaveLoad.cpp UiGame.cpp mm7_1.cpp mm7_2.cpp mm7_4.cpp stru351.h
diffstat 14 files changed, 16 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/Items.h	Wed May 01 13:45:31 2013 +0200
+++ b/Items.h	Wed May 01 13:52:09 2013 +0200
@@ -387,4 +387,19 @@
 	+10 Water Resistance and +2 Alchemy skill.	70
 	Prevents damage from drowning.	71
 	Prevents damage from falling.	72
-*/
\ No newline at end of file
+*/
+
+
+/*  391 */
+#pragma pack(push, 1)
+struct stru351_summoned_item
+{
+  int field_0_expire_second;
+  int field_4_expire_minute;
+  int field_8_expire_hour;
+  int field_C_expire_day;
+  int field_10_expire_week;
+  int field_14_exprie_month;
+  int field_18_expire_year;
+};
+#pragma pack(pop)
\ No newline at end of file
--- a/UIBooks.cpp	Wed May 01 13:45:31 2013 +0200
+++ b/UIBooks.cpp	Wed May 01 13:52:09 2013 +0200
@@ -40,7 +40,6 @@
 #include "StorylineTextTable.h"
 #include "Events2D.h"
 #include "texts.h"
-#include "stru351.h"
 
 #include "mm7_data.h"
 
--- a/UICharacter.cpp	Wed May 01 13:45:31 2013 +0200
+++ b/UICharacter.cpp	Wed May 01 13:52:09 2013 +0200
@@ -40,7 +40,6 @@
 #include "StorylineTextTable.h"
 #include "Events2D.h"
 #include "texts.h"
-#include "stru351.h"
 
 #include "mm7_data.h"
 
--- a/UIMainMenu.cpp	Wed May 01 13:45:31 2013 +0200
+++ b/UIMainMenu.cpp	Wed May 01 13:52:09 2013 +0200
@@ -40,7 +40,6 @@
 #include "StorylineTextTable.h"
 #include "Events2D.h"
 #include "texts.h"
-#include "stru351.h"
 
 #include "mm7_data.h"
 
--- a/UIOptions.cpp	Wed May 01 13:45:31 2013 +0200
+++ b/UIOptions.cpp	Wed May 01 13:52:09 2013 +0200
@@ -40,7 +40,6 @@
 #include "StorylineTextTable.h"
 #include "Events2D.h"
 #include "texts.h"
-#include "stru351.h"
 
 #include "mm7_data.h"
 
--- a/UIPartyCreation.cpp	Wed May 01 13:45:31 2013 +0200
+++ b/UIPartyCreation.cpp	Wed May 01 13:52:09 2013 +0200
@@ -40,7 +40,6 @@
 #include "StorylineTextTable.h"
 #include "Events2D.h"
 #include "texts.h"
-#include "stru351.h"
 
 #include "mm7_data.h"
 
--- a/UIPopup.cpp	Wed May 01 13:45:31 2013 +0200
+++ b/UIPopup.cpp	Wed May 01 13:52:09 2013 +0200
@@ -40,7 +40,6 @@
 #include "StorylineTextTable.h"
 #include "Events2D.h"
 #include "texts.h"
-#include "stru351.h"
 
 #include "mm7_data.h"
 
--- a/UIRest.cpp	Wed May 01 13:45:31 2013 +0200
+++ b/UIRest.cpp	Wed May 01 13:52:09 2013 +0200
@@ -40,7 +40,6 @@
 #include "StorylineTextTable.h"
 #include "Events2D.h"
 #include "texts.h"
-#include "stru351.h"
 
 #include "mm7_data.h"
 
--- a/UISaveLoad.cpp	Wed May 01 13:45:31 2013 +0200
+++ b/UISaveLoad.cpp	Wed May 01 13:52:09 2013 +0200
@@ -40,7 +40,6 @@
 #include "StorylineTextTable.h"
 #include "Events2D.h"
 #include "texts.h"
-#include "stru351.h"
 
 #include "mm7_data.h"
 
--- a/UiGame.cpp	Wed May 01 13:45:31 2013 +0200
+++ b/UiGame.cpp	Wed May 01 13:52:09 2013 +0200
@@ -41,7 +41,6 @@
 #include "StorylineTextTable.h"
 #include "Events2D.h"
 #include "texts.h"
-#include "stru351.h"
 #include "UIHouses.h"
 
 #include "mm7_data.h"
--- a/mm7_1.cpp	Wed May 01 13:45:31 2013 +0200
+++ b/mm7_1.cpp	Wed May 01 13:52:09 2013 +0200
@@ -46,7 +46,6 @@
 #include "StorylineTextTable.h"
 #include "Events2D.h"
 #include "texts.h"
-#include "stru351.h"
 #include "UIHouses.h"
 #include "mm7_data.h"
 
--- a/mm7_2.cpp	Wed May 01 13:45:31 2013 +0200
+++ b/mm7_2.cpp	Wed May 01 13:52:09 2013 +0200
@@ -45,7 +45,6 @@
 #include "CastSpellInfo.h"
 #include "stru298.h"
 #include "stru12.h"
-#include "stru351.h"
 #include "Events2D.h"
 #include "stru159.h"
 #include "Log.h"
--- a/mm7_4.cpp	Wed May 01 13:45:31 2013 +0200
+++ b/mm7_4.cpp	Wed May 01 13:52:09 2013 +0200
@@ -45,7 +45,6 @@
 #include "CastSpellInfo.h"
 #include "stru298.h"
 #include "stru12.h"
-#include "stru351.h"
 #include "Events2D.h"
 #include "stru159.h"
 #include "texts.h"
--- a/stru351.h	Wed May 01 13:45:31 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-#pragma once
-
-
-/*  391 */
-#pragma pack(push, 1)
-struct stru351_summoned_item
-{
-  int field_0_expire_second;
-  int field_4_expire_minute;
-  int field_8_expire_hour;
-  int field_C_expire_day;
-  int field_10_expire_week;
-  int field_14_exprie_month;
-  int field_18_expire_year;
-};
-#pragma pack(pop)
\ No newline at end of file