Created
August 7, 2013 01:15
-
-
Save kahrl/6170401 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/content_sao.cpp b/src/content_sao.cpp | |
index 799c279..ed660cf 100644 | |
--- a/src/content_sao.cpp | |
+++ b/src/content_sao.cpp | |
@@ -943,8 +943,11 @@ bool LuaEntitySAO::collideWithObjects(){ | |
m_properties_sent(true), | |
m_privs(privs), | |
m_is_singleplayer(is_singleplayer), | |
+ m_animation_speed(0), | |
+ m_animation_blend(0), | |
m_animation_sent(false), | |
m_bone_position_sent(false), | |
+ m_attachment_parent_id(0), | |
m_attachment_sent(false), | |
// public | |
m_moved(false), | |
diff --git a/src/filesys.cpp b/src/filesys.cpp | |
index 21ff199..356d301 100644 | |
--- a/src/filesys.cpp | |
+++ b/src/filesys.cpp | |
@@ -595,7 +595,7 @@ bool PathStartsWith(std::string path, std::string prefix) | |
&& !IsDirDelimiter(path[pathpos+len]) | |
&& prefixpos+len < prefixsize | |
&& !IsDirDelimiter( | |
- prefix[prefixsize+len])); | |
+ prefix[prefixpos+len])); | |
pathpos += len; | |
prefixpos += len; | |
} | |
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp | |
index 45b0fe2..0f09eaf 100644 | |
--- a/src/guiFormSpecMenu.cpp | |
+++ b/src/guiFormSpecMenu.cpp | |
@@ -174,6 +174,7 @@ void drawItemStack(video::IVideoDriver *driver, | |
current_keys_pending.key_down = false; | |
current_keys_pending.key_up = false; | |
current_keys_pending.key_enter = false; | |
+ current_keys_pending.key_escape = false; | |
} | |
diff --git a/src/player.cpp b/src/player.cpp | |
index 8028fe6..193de55 100644 | |
--- a/src/player.cpp | |
+++ b/src/player.cpp | |
@@ -34,9 +34,13 @@ | |
is_climbing(false), | |
swimming_vertical(false), | |
camera_barely_in_ceiling(false), | |
+ light(0), | |
inventory(gamedef->idef()), | |
hp(PLAYER_MAX_HP), | |
+ hurt_tilt_timer(0), | |
+ hurt_tilt_strength(0), | |
peer_id(PEER_ID_INEXISTENT), | |
+ keyPressed(0), | |
// protected | |
m_gamedef(gamedef), | |
m_breath(-1), |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment