Merge branch 'master' into eqstream

This commit is contained in:
KimLS
2017-02-06 21:46:34 -08:00
57 changed files with 6422 additions and 2572 deletions
+1
View File
@@ -5154,6 +5154,7 @@ namespace RoF2
IN(type);
IN(invslot);
IN(subslot);
emu->window = (uint8)eq->window;
strn0cpy(emu->txtfile, eq->txtfile, sizeof(emu->txtfile));