Rename

[xonotic/gmqcc.git] / code.c

diff --git a/code.c b/code.c
index 092555170035850f4c441246977f1309b247eecb..43a34c9de78aec26749824fc03d436b502538c5c 100644 (file)
--- a/code.c
+++ b/code.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012
+ * Copyright (C) 2012, 2013
  *     Dale Weiler
  *     Wolfgang Bumiller
  *
@@ -137,8 +137,8 @@ bool code_write(const char *filename, const char *lnofile) {
     code_header.strings.offset    = code_header.globals.offset    + (sizeof(int32_t)                * vec_size(code_globals));
     code_header.strings.length    = vec_size(code_chars);
     code_header.version           = 6;
-    if (opts.forcecrc)
-        code_header.crc16         = opts.forced_crc;
+    if (OPTS_OPTION_BOOL(OPTION_FORCECRC))
+        code_header.crc16         = OPTS_OPTION_U16(OPTION_FORCED_CRC);
     else
         code_header.crc16         = code_crc;
     code_header.entfield          = code_entfields;
@@ -169,7 +169,6 @@ bool code_write(const char *filename, const char *lnofile) {
     util_endianswap(code_globals,    vec_size(code_globals),    sizeof(int32_t));
 
     if (lnofile) {
-        uint32_t lnotype = *(unsigned int*)"LNOF";
         uint32_t version = 1;
 
         fp = file_open(lnofile, "wb");
@@ -180,7 +179,7 @@ bool code_write(const char *filename, const char *lnofile) {
         util_endianswap(code_linenums, vec_size(code_linenums), sizeof(code_linenums[0]));
 
 
-        if (file_write(&lnotype,                        sizeof(lnotype),                        1,                       fp) != 1 ||
+        if (file_write("LNOF",                          4,                                      1,                       fp) != 1 ||
             file_write(&version,                        sizeof(version),                        1,                       fp) != 1 ||
             file_write(&code_header.defs.length,        sizeof(code_header.defs.length),        1,                       fp) != 1 ||
             file_write(&code_header.globals.length,     sizeof(code_header.globals.length),     1,                       fp) != 1 ||