Merge branch 'master' into play

deNULL · Apr 29, 2012 · 28d2efb · 28d2efb
2 parents a70e8ab + 6c84589
commit 28d2efb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/dcpu.htm b/dcpu.htm
@@ -3,7 +3,7 @@
   <title>DCPU-16 emulator</title>
   <link rel="stylesheet" href="css/dcpu.css">
   <script type="text/javascript" src="js/common.js?v=1"></script>
-  <script type="text/javascript" src="js/assembler.js?v=2"></script>
+  <script type="text/javascript" src="js/assembler.js?v=4"></script>
   <script type="text/javascript" src="js/disassembler.js?v=1"></script>
   <script type="text/javascript" src="js/emulator.js?v=1"></script>
   <script type="text/javascript" src="js/screen.js?v=1"></script>

diff --git a/js/assembler.js b/js/assembler.js
@@ -941,6 +941,7 @@ var Assembler = {
         logger(i, pc, pos, text, fatal);
         if (fatal) aborted = true;
       };
+      labels["."] = infos[i].pc;
       infos[i] = this.resolveLine(infos[i], labels, l_logger);
       if (!infos[i]) break;
       for (var j = 0; j < infos[i].dump.length; j++) {