eessppeelllloo/r_e_c_u_r
1
0
Fork 0
mirror of https://github.com/cyberboy666/r_e_c_u_r.git synced 2025-12-15 12:50:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into feature_plugins

Browse Source
This commit is contained in:
Tristan Rowley
2020-03-01 16:10:10 +00:00
parent 452280805c d6fa0b81f7
commit b015574585
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data_centre/data.py
View File

@@ -89,7 +89,8 @@ class Data(object):
self.shader_bank_data = [self.create_empty_shader_bank() for i in range(3)] self.shader_bank_data = [self.create_empty_shader_bank() for i in range(3)]
if os.path.isfile(self.PATH_TO_DATA_OBJECTS + self.SHADER_BANK_DATA_JSON): if os.path.isfile(self.PATH_TO_DATA_OBJECTS + self.SHADER_BANK_DATA_JSON):
self.shader_bank_data = self._read_json(self.SHADER_BANK_DATA_JSON) self.shader_bank_data = self._read_json(self.SHADER_BANK_DATA_JSON)
self.settings = self.default_settings = self._read_json(self.DEFAULT_SETTINGS_JSON) self.settings = self._read_json(self.DEFAULT_SETTINGS_JSON)
self.default_settings = self.settings.copy()
if os.path.isfile(self.PATH_TO_DATA_OBJECTS + self.SETTINGS_JSON): if os.path.isfile(self.PATH_TO_DATA_OBJECTS + self.SETTINGS_JSON):
self.settings = self._read_json(self.SETTINGS_JSON) self.settings = self._read_json(self.SETTINGS_JSON)

4
user_input/numpad_input.py
View File

@@ -43,7 +43,9 @@ class NumpadInput(object):
self.data.is_display_held = False self.data.is_display_held = False
def on_mouse_move(self, event): def on_mouse_move(self, event):
if self.data.settings['user_input']['MOUSE_INPUT']['value'] != 'enabled': if self.data.settings['user_input'].setdefault(
'MOUSE_INPUT',
self.data.default_settings.get('MOUSE_INPUT',{'value': 'enabled'})).get('value') != 'enabled':
return return
if event.x > 480 or event.y > 320: if event.x > 480 or event.y > 320:
return return