Merge branch 'master' into jgrpp
# Conflicts: # src/3rdparty/fmt/core.h # src/command_type.h # src/console_cmds.cpp # src/core/overflowsafe_type.hpp # src/landscape.cpp # src/network/network.cpp # src/newgrf_object.h # src/object_cmd.cpp # src/order_gui.cpp # src/saveload/vehicle_sl.cpp # src/script/api/script_industrytype.cpp # src/script/api/script_object.hpp # src/script/api/script_town.cpp # src/table/object_land.h # src/timetable_cmd.cpp # src/tree_cmd.cpp # src/vehicle_gui.cpp # src/window.cpp
This commit is contained in:
1
src/3rdparty/squirrel/squirrel/sqclass.h
vendored
1
src/3rdparty/squirrel/squirrel/sqclass.h
vendored
@@ -10,6 +10,7 @@ struct SQClassMember {
|
||||
val = o.val;
|
||||
attrs = o.attrs;
|
||||
}
|
||||
SQClassMember& operator=(SQClassMember &o) = delete;
|
||||
SQObjectPtr val;
|
||||
SQObjectPtr attrs;
|
||||
};
|
||||
|
Reference in New Issue
Block a user