From 01f13c6ac3870ac5cacb44176398e3998d7cc301 Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Mon, 14 Apr 2014 21:15:38 +0100
Subject: [PATCH] [Change] Renamed misn_lua to llua_misn
---
src/lephisto.c | 2 +-
src/{misn_lua.c => llua_misn.c} | 2 +-
src/{misn_lua.h => llua_misn.h} | 0
src/mission.h | 2 +-
src/music.c | 2 +-
src/player.c | 4 ++--
6 files changed, 6 insertions(+), 6 deletions(-)
rename src/{misn_lua.c => llua_misn.c} (99%)
rename src/{misn_lua.h => llua_misn.h} (100%)
diff --git a/src/lephisto.c b/src/lephisto.c
index 0d2c38d..4534741 100644
--- a/src/lephisto.c
+++ b/src/lephisto.c
@@ -49,7 +49,7 @@
#include "economy.h"
#include "menu.h"
#include "mission.h"
-#include "misn_lua.h"
+#include "llua_misn.h"
#include "lfile.h"
#include "unidiff.h"
#include "nebulae.h"
diff --git a/src/misn_lua.c b/src/llua_misn.c
similarity index 99%
rename from src/misn_lua.c
rename to src/llua_misn.c
index 470cbaf..6d6db59 100644
--- a/src/misn_lua.c
+++ b/src/llua_misn.c
@@ -25,7 +25,7 @@
#include "xml.h"
#include "music.h"
#include "unidiff.h"
-#include "misn_lua.h"
+#include "llua_misn.h"
/* Similar to lua vars, but with less variety. */
#define MISN_VAR_NIL 0
diff --git a/src/misn_lua.h b/src/llua_misn.h
similarity index 100%
rename from src/misn_lua.h
rename to src/llua_misn.h
diff --git a/src/mission.h b/src/mission.h
index 40bd45c..49ca90e 100644
--- a/src/mission.h
+++ b/src/mission.h
@@ -1,5 +1,5 @@
#pragma once
-#include "misn_lua.h"
+#include "llua_misn.h"
/* Availability by location. */
#define MIS_AVAIL_NONE 0
diff --git a/src/music.c b/src/music.c
index a1193e5..55c49f9 100644
--- a/src/music.c
+++ b/src/music.c
@@ -9,7 +9,7 @@
#include "llua.h"
#include "lluadef.h"
-#include "misn_lua.h"
+#include "llua_misn.h"
#include "lephisto.h"
#include "log.h"
diff --git a/src/player.c b/src/player.c
index c64a762..eb30ae0 100644
--- a/src/player.c
+++ b/src/player.c
@@ -23,7 +23,7 @@
#include "toolkit.h"
#include "dialogue.h"
#include "mission.h"
-#include "misn_lua.h"
+#include "llua_misn.h"
#include "ltime.h"
#include "hook.h"
#include "map.h"
@@ -95,7 +95,7 @@ int hyperspace_target = -1; /**< Target hyperspace route. -1 is none
static unsigned int player_timer = 0; /**< For death and such. */
static Vec2 player_cam; /**< Again, for death etc. */
/* For interference. */
-static int interference_layer = 5; /**< Layer of the current interference. */
+static int interference_layer = 0; /**< Layer of the current interference. */
static double interference_alpha = 0.; /**< Alpha of the current interference layer. */
static double interference_t = 0.; /**< Interference timer to control transitions. */